diff --git a/src/Avalonia/Artemis.UI.Shared/Events/DataModelInputDynamicEventArgs.cs b/src/Avalonia/Artemis.UI.Shared/Events/DataModelInputDynamicEventArgs.cs deleted file mode 100644 index 537b7ec11..000000000 --- a/src/Avalonia/Artemis.UI.Shared/Events/DataModelInputDynamicEventArgs.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using Artemis.Core; - -namespace Artemis.UI.Shared.Events -{ - /// - /// Provides data about selection events raised by - /// - public class DataModelInputDynamicEventArgs : EventArgs - { - internal DataModelInputDynamicEventArgs(DataModelPath? dataModelPath) - { - DataModelPath = dataModelPath; - } - - /// - /// Gets the data model path that was selected - /// - public DataModelPath? DataModelPath { get; } - } -} \ No newline at end of file diff --git a/src/Avalonia/Artemis.UI.Shared/Events/DataModelInputStaticEventArgs.cs b/src/Avalonia/Artemis.UI.Shared/Events/DataModelInputStaticEventArgs.cs deleted file mode 100644 index beba22fae..000000000 --- a/src/Avalonia/Artemis.UI.Shared/Events/DataModelInputStaticEventArgs.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; - -namespace Artemis.UI.Shared.Events -{ - /// - /// Provides data about submit events raised by - /// - public class DataModelInputStaticEventArgs : EventArgs - { - internal DataModelInputStaticEventArgs(object? value) - { - Value = value; - } - - /// - /// The value that was submitted - /// - public object? Value { get; } - } -} \ No newline at end of file diff --git a/src/Avalonia/Artemis.UI.Shared/Events/SelectionRectangleEventArgs.cs b/src/Avalonia/Artemis.UI.Shared/Events/SelectionRectangleEventArgs.cs deleted file mode 100644 index 2402b0858..000000000 --- a/src/Avalonia/Artemis.UI.Shared/Events/SelectionRectangleEventArgs.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using Avalonia; - -namespace Artemis.UI.Shared.Events -{ - public class SelectionRectangleEventArgs : EventArgs - { - public SelectionRectangleEventArgs(Rect rect) - { - Rect = rect; - } - - public Rect Rect { get; } - } -} \ No newline at end of file diff --git a/src/Avalonia/Artemis.UI/ArtemisBootstrapper.cs b/src/Avalonia/Artemis.UI/ArtemisBootstrapper.cs index 8d47b2f6d..a9d2f06d3 100644 --- a/src/Avalonia/Artemis.UI/ArtemisBootstrapper.cs +++ b/src/Avalonia/Artemis.UI/ArtemisBootstrapper.cs @@ -1,7 +1,7 @@ using Artemis.Core.Ninject; using Artemis.UI.Exceptions; using Artemis.UI.Ninject; -using Artemis.UI.Screens.Root.ViewModels; +using Artemis.UI.Screens.Root; using Artemis.UI.Shared.Ninject; using Avalonia.Controls.ApplicationLifetimes; using Ninject; diff --git a/src/Avalonia/Artemis.UI/MainWindow.axaml.cs b/src/Avalonia/Artemis.UI/MainWindow.axaml.cs index c49ecd415..ad4cf0110 100644 --- a/src/Avalonia/Artemis.UI/MainWindow.axaml.cs +++ b/src/Avalonia/Artemis.UI/MainWindow.axaml.cs @@ -1,4 +1,4 @@ -using Artemis.UI.Screens.Root.ViewModels; +using Artemis.UI.Screens.Root; using Avalonia; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; diff --git a/src/Avalonia/Artemis.UI/Ninject/Factories/IVMFactory.cs b/src/Avalonia/Artemis.UI/Ninject/Factories/IVMFactory.cs index b8e08da13..736298c31 100644 --- a/src/Avalonia/Artemis.UI/Ninject/Factories/IVMFactory.cs +++ b/src/Avalonia/Artemis.UI/Ninject/Factories/IVMFactory.cs @@ -1,11 +1,11 @@ using System.Collections.ObjectModel; using Artemis.Core; -using Artemis.UI.Screens.Device.Tabs.ViewModels; -using Artemis.UI.Screens.Device.ViewModels; -using Artemis.UI.Screens.Plugins.ViewModels; -using Artemis.UI.Screens.Root.ViewModels; -using Artemis.UI.Screens.Settings.Tabs.ViewModels; -using Artemis.UI.Screens.SurfaceEditor.ViewModels; +using Artemis.UI.Screens.Device; +using Artemis.UI.Screens.Device.Tabs; +using Artemis.UI.Screens.Plugins; +using Artemis.UI.Screens.Root.Sidebar; +using Artemis.UI.Screens.Settings.Tabs; +using Artemis.UI.Screens.SurfaceEditor; using ReactiveUI; namespace Artemis.UI.Ninject.Factories diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceDetectInputView.axaml b/src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml similarity index 94% rename from src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceDetectInputView.axaml rename to src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml index 760e110ec..310120d5c 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceDetectInputView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="1050" - x:Class="Artemis.UI.Screens.Device.Views.DeviceDetectInputView"> + x:Class="Artemis.UI.Screens.Device.DeviceDetectInputView"> diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceDetectInputView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs similarity index 80% rename from src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceDetectInputView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs index c36de345a..e82e7a74f 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceDetectInputView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs @@ -1,8 +1,7 @@ -using Artemis.UI.Screens.Device.ViewModels; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Device.Views +namespace Artemis.UI.Screens.Device { public class DeviceDetectInputView : ReactiveUserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DeviceDetectInputViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs similarity index 97% rename from src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DeviceDetectInputViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs index a26178751..e69616629 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DeviceDetectInputViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs @@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services.Interfaces; using ReactiveUI; using RGB.NET.Core; -namespace Artemis.UI.Screens.Device.ViewModels +namespace Artemis.UI.Screens.Device { public class DeviceDetectInputViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Views/DevicePropertiesView.axaml b/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Device/Views/DevicePropertiesView.axaml rename to src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml index 5d8fbd58a..3e51dbae6 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Views/DevicePropertiesView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared" mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800" - x:Class="Artemis.UI.Screens.Device.Views.DevicePropertiesView" + x:Class="Artemis.UI.Screens.Device.DevicePropertiesView" Title="Artemis | Device Properties" Width="1250" Height="900" diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Views/DevicePropertiesView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs similarity index 83% rename from src/Avalonia/Artemis.UI/Screens/Device/Views/DevicePropertiesView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs index 624fc567c..d525d7c7f 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Views/DevicePropertiesView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs @@ -1,9 +1,8 @@ -using Artemis.UI.Screens.Device.ViewModels; using Avalonia; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Device.Views +namespace Artemis.UI.Screens.Device { public partial class DevicePropertiesView : ReactiveWindow { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DevicePropertiesViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs similarity index 96% rename from src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DevicePropertiesViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs index 4ce089f9b..039d776f3 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DevicePropertiesViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs @@ -5,7 +5,7 @@ using Artemis.UI.Shared; using RGB.NET.Core; using ArtemisLed = Artemis.Core.ArtemisLed; -namespace Artemis.UI.Screens.Device.ViewModels +namespace Artemis.UI.Screens.Device { public class DevicePropertiesViewModel : DialogViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceSettingsView.axaml b/src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsView.axaml similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceSettingsView.axaml rename to src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsView.axaml index d36be0a13..c770b2c3f 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceSettingsView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsView.axaml @@ -6,7 +6,7 @@ xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:controls1="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Device.Views.DeviceSettingsView"> + x:Class="Artemis.UI.Screens.Device.DeviceSettingsView"> diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceSettingsView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs similarity index 88% rename from src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceSettingsView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs index c72252e4a..2f10695a3 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceSettingsView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.Device.Views +namespace Artemis.UI.Screens.Device { public partial class DeviceSettingsView : UserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DeviceSettingsViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsViewModel.cs similarity index 97% rename from src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DeviceSettingsViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsViewModel.cs index db9a9f4f3..c031f8dba 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DeviceSettingsViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsViewModel.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Ninject.Factories; -using Artemis.UI.Screens.Settings.Tabs.ViewModels; +using Artemis.UI.Screens.Settings.Tabs; using Artemis.UI.Shared; using Artemis.UI.Shared.Services.Interfaces; using Avalonia.Threading; @@ -11,7 +11,7 @@ using Humanizer; using ReactiveUI; using RGB.NET.Core; -namespace Artemis.UI.Screens.Device.ViewModels +namespace Artemis.UI.Screens.Device { public class DeviceSettingsViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceInfoTabView.axaml b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceInfoTabView.axaml rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml index 3541903cf..5a29d5fa8 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceInfoTabView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Device.Tabs.Views.DeviceInfoTabView"> + x:Class="Artemis.UI.Screens.Device.Tabs.DeviceInfoTabView"> diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceInfoTabView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml.cs similarity index 87% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceInfoTabView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml.cs index b08fabd45..6970c9ce7 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceInfoTabView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.Device.Tabs.Views +namespace Artemis.UI.Screens.Device.Tabs { public partial class DeviceInfoTabView : UserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DeviceInfoTabViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabViewModel.cs similarity index 95% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DeviceInfoTabViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabViewModel.cs index c2a96146d..839b930b2 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DeviceInfoTabViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabViewModel.cs @@ -5,7 +5,7 @@ using Artemis.UI.Shared.Services.Interfaces; using Avalonia; using RGB.NET.Core; -namespace Artemis.UI.Screens.Device.Tabs.ViewModels +namespace Artemis.UI.Screens.Device.Tabs { public class DeviceInfoTabViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceLedsTabView.axaml b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabView.axaml similarity index 83% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceLedsTabView.axaml rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabView.axaml index f3cef6e32..394c08db0 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceLedsTabView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabView.axaml @@ -3,6 +3,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Device.Tabs.Views.DeviceLedsTabView"> + x:Class="Artemis.UI.Screens.Device.Tabs.DeviceLedsTabView"> Welcome to Avalonia! diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceLedsTabView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabView.axaml.cs similarity index 87% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceLedsTabView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabView.axaml.cs index e0057260e..b2cfe8437 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceLedsTabView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabView.axaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.Device.Tabs.Views +namespace Artemis.UI.Screens.Device.Tabs { public partial class DeviceLedsTabView : UserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DeviceLedsTabViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabViewModel.cs similarity index 97% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DeviceLedsTabViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabViewModel.cs index 1987a2894..30d48729f 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DeviceLedsTabViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabViewModel.cs @@ -8,7 +8,7 @@ using Artemis.UI.Shared; using DynamicData.Binding; using ReactiveUI; -namespace Artemis.UI.Screens.Device.Tabs.ViewModels +namespace Artemis.UI.Screens.Device.Tabs { public class DeviceLedsTabViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DevicePropertiesTabView.axaml b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml similarity index 97% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DevicePropertiesTabView.axaml rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml index de3a7059c..a5a5a4585 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DevicePropertiesTabView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml @@ -5,14 +5,14 @@ xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:converters="clr-namespace:Artemis.UI.Shared.Converters;assembly=Artemis.UI.Shared" - xmlns:viewModels="clr-namespace:Artemis.UI.Screens.Device.Tabs.ViewModels" + xmlns:tabs="clr-namespace:Artemis.UI.Screens.Device.Tabs" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="1200" - x:Class="Artemis.UI.Screens.Device.Tabs.Views.DevicePropertiesTabView"> + x:Class="Artemis.UI.Screens.Device.Tabs.DevicePropertiesTabView"> - + diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DevicePropertiesTabView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml.cs similarity index 85% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DevicePropertiesTabView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml.cs index 31e29cbb3..80370bc67 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DevicePropertiesTabView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml.cs @@ -1,9 +1,8 @@ -using Artemis.UI.Screens.Device.Tabs.ViewModels; using Avalonia.Input; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Device.Tabs.Views +namespace Artemis.UI.Screens.Device.Tabs { public partial class DevicePropertiesTabView : ReactiveUserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DevicePropertiesTabViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabViewModel.cs similarity index 99% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DevicePropertiesTabViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabViewModel.cs index a94898182..be267493f 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DevicePropertiesTabViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabViewModel.cs @@ -10,7 +10,7 @@ using Artemis.UI.Shared.Services.Interfaces; using ReactiveUI; using SkiaSharp; -namespace Artemis.UI.Screens.Device.Tabs.ViewModels +namespace Artemis.UI.Screens.Device.Tabs { public class DevicePropertiesTabViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/InputMappingsTabView.axaml b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabView.axaml similarity index 82% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/InputMappingsTabView.axaml rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabView.axaml index 9cb5e59c8..602ca4c5c 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/InputMappingsTabView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabView.axaml @@ -3,6 +3,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Device.Tabs.Views.InputMappingsTabView"> + x:Class="Artemis.UI.Screens.Device.Tabs.InputMappingsTabView"> Welcome to Avalonia! diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/InputMappingsTabView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabView.axaml.cs similarity index 87% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/InputMappingsTabView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabView.axaml.cs index 53c7dc6ad..462e1455e 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/InputMappingsTabView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabView.axaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace Artemis.UI.Screens.Device.Tabs.Views +namespace Artemis.UI.Screens.Device.Tabs { public partial class InputMappingsTabView : UserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/InputMappingsTabViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabViewModel.cs similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/InputMappingsTabViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabViewModel.cs index 3f51b9e70..96cf5d740 100644 --- a/src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/InputMappingsTabViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabViewModel.cs @@ -9,7 +9,7 @@ using Artemis.UI.Shared; using ReactiveUI; using RGB.NET.Core; -namespace Artemis.UI.Screens.Device.Tabs.ViewModels +namespace Artemis.UI.Screens.Device.Tabs { public class InputMappingsTabViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Home/Views/HomeView.axaml b/src/Avalonia/Artemis.UI/Screens/Home/HomeView.axaml similarity index 99% rename from src/Avalonia/Artemis.UI/Screens/Home/Views/HomeView.axaml rename to src/Avalonia/Artemis.UI/Screens/Home/HomeView.axaml index 0bc31a2ea..c34ba7bca 100644 --- a/src/Avalonia/Artemis.UI/Screens/Home/Views/HomeView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Home/HomeView.axaml @@ -6,7 +6,7 @@ xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="900" - x:Class="Artemis.UI.Screens.Home.Views.HomeView"> + x:Class="Artemis.UI.Screens.Home.HomeView"> { diff --git a/src/Avalonia/Artemis.UI/Screens/Home/ViewModels/HomeViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Home/HomeViewModel.cs similarity index 83% rename from src/Avalonia/Artemis.UI/Screens/Home/ViewModels/HomeViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Home/HomeViewModel.cs index f1d087825..1bd0d3032 100644 --- a/src/Avalonia/Artemis.UI/Screens/Home/ViewModels/HomeViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Home/HomeViewModel.cs @@ -1,6 +1,6 @@ using ReactiveUI; -namespace Artemis.UI.Screens.Home.ViewModels +namespace Artemis.UI.Screens.Home { public class HomeViewModel : MainScreenViewModel { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisitesInstallDialogViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisitesInstallDialogViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs index f4960bb9c..24fd35ba8 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisitesInstallDialogViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs @@ -10,7 +10,7 @@ using Artemis.UI.Shared; using Artemis.UI.Shared.Services.Interfaces; using ReactiveUI; -namespace Artemis.UI.Screens.Plugins.ViewModels +namespace Artemis.UI.Screens.Plugins.Dialogs { public class PluginPrerequisitesInstallDialogViewModel : DialogViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisitesUninstallDialogViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs similarity index 99% rename from src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisitesUninstallDialogViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs index 146712b13..0be1f29a8 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisitesUninstallDialogViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs @@ -11,7 +11,7 @@ using Artemis.UI.Shared; using Artemis.UI.Shared.Services.Interfaces; using ReactiveUI; -namespace Artemis.UI.Screens.Plugins.ViewModels +namespace Artemis.UI.Screens.Plugins.Dialogs { public class PluginPrerequisitesUninstallDialogViewModel : DialogViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginFeatureView.axaml b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureView.axaml similarity index 97% rename from src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginFeatureView.axaml rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureView.axaml index d9d938ae1..7fc48d380 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginFeatureView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureView.axaml @@ -5,7 +5,7 @@ xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" xmlns:controls="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Plugins.Views.PluginFeatureView"> + x:Class="Artemis.UI.Screens.Plugins.PluginFeatureView"> diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginFeatureView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureView.axaml.cs similarity index 80% rename from src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginFeatureView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureView.axaml.cs index e432b4435..115f00ca0 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginFeatureView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureView.axaml.cs @@ -1,8 +1,7 @@ -using Artemis.UI.Screens.Plugins.ViewModels; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Plugins.Views +namespace Artemis.UI.Screens.Plugins { public partial class PluginFeatureView : ReactiveUserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginFeatureViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureViewModel.cs similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginFeatureViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureViewModel.cs index fdba3ed41..cc7809133 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginFeatureViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureViewModel.cs @@ -4,12 +4,13 @@ using System.Linq; using System.Threading.Tasks; using Artemis.Core; using Artemis.Core.Services; +using Artemis.UI.Screens.Plugins.Dialogs; using Artemis.UI.Shared; using Artemis.UI.Shared.Services.Builders; using Artemis.UI.Shared.Services.Interfaces; using ReactiveUI; -namespace Artemis.UI.Screens.Plugins.ViewModels +namespace Artemis.UI.Screens.Plugins { public class PluginFeatureViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisiteActionViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginPrerequisiteActionViewModel.cs similarity index 86% rename from src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisiteActionViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginPrerequisiteActionViewModel.cs index d2ef14784..19b6a3f46 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisiteActionViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginPrerequisiteActionViewModel.cs @@ -1,7 +1,7 @@ using Artemis.Core; using Artemis.UI.Shared; -namespace Artemis.UI.Screens.Plugins.ViewModels +namespace Artemis.UI.Screens.Plugins { public class PluginPrerequisiteActionViewModel : ViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisiteViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginPrerequisiteViewModel.cs similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisiteViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginPrerequisiteViewModel.cs index c7aa6e392..8a2c6c28f 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisiteViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginPrerequisiteViewModel.cs @@ -7,7 +7,7 @@ using Artemis.Core; using Artemis.UI.Shared; using ReactiveUI; -namespace Artemis.UI.Screens.Plugins.ViewModels +namespace Artemis.UI.Screens.Plugins { public class PluginPrerequisiteViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsView.axaml b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsView.axaml rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml index 3d80c7ab8..8f2796ae8 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml @@ -6,7 +6,7 @@ xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia" xmlns:controls1="clr-namespace:Artemis.UI.Shared.Controls;assembly=Artemis.UI.Shared" mc:Ignorable="d" d:DesignWidth="900" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Plugins.Views.PluginSettingsView"> + x:Class="Artemis.UI.Screens.Plugins.PluginSettingsView"> diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml.cs similarity index 80% rename from src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml.cs index 31cae533a..5c046aeab 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml.cs @@ -1,8 +1,7 @@ -using Artemis.UI.Screens.Plugins.ViewModels; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Plugins.Views +namespace Artemis.UI.Screens.Plugins { public partial class PluginSettingsView : ReactiveUserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginSettingsViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsViewModel.cs similarity index 99% rename from src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginSettingsViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsViewModel.cs index a37561ba7..1702e2e09 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginSettingsViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsViewModel.cs @@ -9,13 +9,14 @@ using Artemis.Core; using Artemis.Core.Services; using Artemis.UI.Exceptions; using Artemis.UI.Ninject.Factories; +using Artemis.UI.Screens.Plugins.Dialogs; using Artemis.UI.Shared; using Artemis.UI.Shared.Services.Interfaces; using Avalonia.Threading; using Ninject; using ReactiveUI; -namespace Artemis.UI.Screens.Plugins.ViewModels +namespace Artemis.UI.Screens.Plugins { public class PluginSettingsViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsWindowView.axaml b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml similarity index 90% rename from src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsWindowView.axaml rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml index 82a8d3393..788b5ff10 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsWindowView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml @@ -3,7 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Plugins.Views.PluginSettingsWindowView" + x:Class="Artemis.UI.Screens.Plugins.PluginSettingsWindowView" Title="{Binding DisplayName}" ExtendClientAreaToDecorationsHint="True" Width="800" diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsWindowView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml.cs similarity index 91% rename from src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsWindowView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml.cs index fb152bbf9..67a67d977 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsWindowView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml.cs @@ -1,13 +1,12 @@ using System; using System.Reactive.Disposables; using System.Reactive.Linq; -using Artemis.UI.Screens.Plugins.ViewModels; using Avalonia; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; using ReactiveUI; -namespace Artemis.UI.Screens.Plugins.Views +namespace Artemis.UI.Screens.Plugins { public class PluginSettingsWindowView : ReactiveWindow { diff --git a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginSettingsWindowViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowViewModel.cs similarity index 92% rename from src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginSettingsWindowViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowViewModel.cs index 78118b2a0..3771d30f0 100644 --- a/src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginSettingsWindowViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowViewModel.cs @@ -2,7 +2,7 @@ using Artemis.Core; using Artemis.UI.Shared; -namespace Artemis.UI.Screens.Plugins.ViewModels +namespace Artemis.UI.Screens.Plugins { public class PluginSettingsWindowViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/ProfileEditor/Views/ProfileEditorView.axaml b/src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml similarity index 82% rename from src/Avalonia/Artemis.UI/Screens/ProfileEditor/Views/ProfileEditorView.axaml rename to src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml index 7e808d336..5770a7a23 100644 --- a/src/Avalonia/Artemis.UI/Screens/ProfileEditor/Views/ProfileEditorView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml @@ -3,6 +3,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.ProfileEditor.Views.ProfileEditorView"> + x:Class="Artemis.UI.Screens.ProfileEditor.ProfileEditorView"> Welcome to Avalonia! diff --git a/src/Avalonia/Artemis.UI/Screens/ProfileEditor/Views/ProfileEditorView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs similarity index 77% rename from src/Avalonia/Artemis.UI/Screens/ProfileEditor/Views/ProfileEditorView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs index ca7b4bb7a..6949c7a36 100644 --- a/src/Avalonia/Artemis.UI/Screens/ProfileEditor/Views/ProfileEditorView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs @@ -1,8 +1,7 @@ -using Artemis.UI.Screens.ProfileEditor.ViewModels; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.ProfileEditor.Views +namespace Artemis.UI.Screens.ProfileEditor { public class ProfileEditorView : ReactiveUserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/ProfileEditor/ViewModels/ProfileEditorViewModel.cs b/src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs similarity index 67% rename from src/Avalonia/Artemis.UI/Screens/ProfileEditor/ViewModels/ProfileEditorViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs index 5ebeb327d..146bd4ed0 100644 --- a/src/Avalonia/Artemis.UI/Screens/ProfileEditor/ViewModels/ProfileEditorViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs @@ -1,6 +1,6 @@ using Artemis.UI.Shared; -namespace Artemis.UI.Screens.ProfileEditor.ViewModels +namespace Artemis.UI.Screens.ProfileEditor { public class ProfileEditorViewModel : ActivatableViewModelBase { diff --git a/src/Avalonia/Artemis.UI/Screens/Root/Views/RootView.axaml b/src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml similarity index 94% rename from src/Avalonia/Artemis.UI/Screens/Root/Views/RootView.axaml rename to src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml index c2bab7563..967bd9260 100644 --- a/src/Avalonia/Artemis.UI/Screens/Root/Views/RootView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:reactiveUi="http://reactiveui.net" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Root.Views.RootView"> + x:Class="Artemis.UI.Screens.Root.RootView"> diff --git a/src/Avalonia/Artemis.UI/Screens/Root/Views/RootView.axaml.cs b/src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml.cs similarity index 79% rename from src/Avalonia/Artemis.UI/Screens/Root/Views/RootView.axaml.cs rename to src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml.cs index 410cd3174..8190bb82e 100644 --- a/src/Avalonia/Artemis.UI/Screens/Root/Views/RootView.axaml.cs +++ b/src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml.cs @@ -1,8 +1,7 @@ -using Artemis.UI.Screens.Root.ViewModels; using Avalonia.Markup.Xaml; using Avalonia.ReactiveUI; -namespace Artemis.UI.Screens.Root.Views +namespace Artemis.UI.Screens.Root { public class RootView : ReactiveUserControl { diff --git a/src/Avalonia/Artemis.UI/Screens/Root/ViewModels/RootViewModel.cs b/src/Avalonia/Artemis.UI/Screens/Root/RootViewModel.cs similarity index 91% rename from src/Avalonia/Artemis.UI/Screens/Root/ViewModels/RootViewModel.cs rename to src/Avalonia/Artemis.UI/Screens/Root/RootViewModel.cs index 21b895560..8e6bdda11 100644 --- a/src/Avalonia/Artemis.UI/Screens/Root/ViewModels/RootViewModel.cs +++ b/src/Avalonia/Artemis.UI/Screens/Root/RootViewModel.cs @@ -1,10 +1,11 @@ using Artemis.Core.Services; using Artemis.UI.Ninject.Factories; +using Artemis.UI.Screens.Root.Sidebar; using Artemis.UI.Services.Interfaces; using Artemis.UI.Shared; using ReactiveUI; -namespace Artemis.UI.Screens.Root.ViewModels +namespace Artemis.UI.Screens.Root { public class RootViewModel : ActivatableViewModelBase, IScreen { diff --git a/src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarCategoryView.axaml b/src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarCategoryView.axaml similarity index 98% rename from src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarCategoryView.axaml rename to src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarCategoryView.axaml index 4fe165ef4..500b30c08 100644 --- a/src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarCategoryView.axaml +++ b/src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarCategoryView.axaml @@ -3,9 +3,9 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia" - xmlns:local="clr-namespace:Artemis.UI.Screens.Root.ViewModels" + xmlns:local="clr-namespace:Artemis.UI.Screens.Root.Sidebar" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="Artemis.UI.Screens.Root.Views.SidebarCategoryView"> + x:Class="Artemis.UI.Screens.Root.Sidebar.SidebarCategoryView">