DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

UI - Simplify folder structure to match old project better

Browse Source
This commit is contained in:
Robert 2021-11-21 10:02:33 +01:00
parent e4c1c99e27
commit 091b65d1e4
86 changed files with 102 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Avalonia/Artemis.UI.Shared/Events/DataModelInputDynamicEventArgs.cs
View File

@ -1,21 +0,0 @@
using System;
using Artemis.Core;
namespace Artemis.UI.Shared.Events
{
/// <summary>
/// Provides data about selection events raised by <see cref="DataModelDynamicViewModel" />
/// </summary>
public class DataModelInputDynamicEventArgs : EventArgs
{
internal DataModelInputDynamicEventArgs(DataModelPath? dataModelPath)
{
DataModelPath = dataModelPath;
}
/// <summary>
/// Gets the data model path that was selected
/// </summary>
public DataModelPath? DataModelPath { get; }
}
}

20
src/Avalonia/Artemis.UI.Shared/Events/DataModelInputStaticEventArgs.cs
View File

@ -1,20 +0,0 @@
using System;
namespace Artemis.UI.Shared.Events
{
/// <summary>
/// Provides data about submit events raised by <see cref="DataModelStaticViewModel" />
/// </summary>
public class DataModelInputStaticEventArgs : EventArgs
{
internal DataModelInputStaticEventArgs(object? value)
{
Value = value;
}
/// <summary>
/// The value that was submitted
/// </summary>
public object? Value { get; }
}
}

15
src/Avalonia/Artemis.UI.Shared/Events/SelectionRectangleEventArgs.cs
View File

@ -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; }
}
}

2
src/Avalonia/Artemis.UI/ArtemisBootstrapper.cs
View File

@ -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;

2
src/Avalonia/Artemis.UI/MainWindow.axaml.cs
View File

@ -1,4 +1,4 @@
using Artemis.UI.Screens.Root.ViewModels;
using Artemis.UI.Screens.Root;
using Avalonia;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;

12
src/Avalonia/Artemis.UI/Ninject/Factories/IVMFactory.cs
View File

@ -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

2
src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceDetectInputView.axaml → src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml
View File

@ -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">
<StackPanel Width="500">
<!-- TODO: Replace with Text.Run stuff once available -->
<TextBlock TextWrapping="Wrap">

3
src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceDetectInputView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs
View File

@ -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<DeviceDetectInputViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DeviceDetectInputViewModel.cs → src/Avalonia/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Device/Views/DevicePropertiesView.axaml → src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
View File

@ -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"

3
src/Avalonia/Artemis.UI/Screens/Device/Views/DevicePropertiesView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs
View File

@ -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<DevicePropertiesViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DevicePropertiesViewModel.cs → src/Avalonia/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs
View File

@ -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<object>
{

2
src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceSettingsView.axaml → src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsView.axaml
View File

@ -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">
<Border Classes="card" Padding="0" Width="200" ClipToBounds="True" Margin="5">
<Grid RowDefinitions="140,*,Auto">
<Rectangle Grid.Row="0">

2
src/Avalonia/Artemis.UI/Screens/Device/Views/DeviceSettingsView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs
View File

@ -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
{

4
src/Avalonia/Artemis.UI/Screens/Device/ViewModels/DeviceSettingsViewModel.cs → src/Avalonia/Artemis.UI/Screens/Device/DeviceSettingsViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceInfoTabView.axaml → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml
View File

@ -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">
<Grid RowDefinitions="Auto,*" ColumnDefinitions="*,*" Margin="-5">
<!-- First row -->
<Border Classes="card" Grid.Column="0" Grid.Row="0" Margin="5">

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceInfoTabView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabView.axaml.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DeviceInfoTabViewModel.cs → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceInfoTabViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceLedsTabView.axaml → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabView.axaml
View File

@ -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!
</UserControl>

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DeviceLedsTabView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabView.axaml.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DeviceLedsTabViewModel.cs → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DeviceLedsTabViewModel.cs
View File

@ -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
{

6
src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DevicePropertiesTabView.axaml → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml
View File

@ -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">
<UserControl.Resources>
<converters:SKColorToColorConverter x:Key="SKColorToColorConverter" />
</UserControl.Resources>
<Design.DataContext>
<viewModels:DevicePropertiesTabViewModel />
<tabs:DevicePropertiesTabViewModel />
</Design.DataContext>
<!-- Body -->

3
src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/DevicePropertiesTabView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabView.axaml.cs
View File

@ -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<DevicePropertiesTabViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/DevicePropertiesTabViewModel.cs → src/Avalonia/Artemis.UI/Screens/Device/Tabs/DevicePropertiesTabViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/InputMappingsTabView.axaml → src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabView.axaml
View File

@ -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!
</UserControl>

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/Views/InputMappingsTabView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabView.axaml.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Device/Tabs/ViewModels/InputMappingsTabViewModel.cs → src/Avalonia/Artemis.UI/Screens/Device/Tabs/InputMappingsTabViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Home/Views/HomeView.axaml → src/Avalonia/Artemis.UI/Screens/Home/HomeView.axaml
View File

@ -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">
<Grid RowDefinitions="200,*">
<Image Grid.Row="0"
Grid.RowSpan="2"

3
src/Avalonia/Artemis.UI/Screens/Home/Views/HomeView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Home/HomeView.axaml.cs
View File

@ -1,8 +1,7 @@
using Artemis.UI.Screens.Home.ViewModels;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Home.Views
namespace Artemis.UI.Screens.Home
{
public class HomeView : ReactiveUserControl<HomeViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Home/ViewModels/HomeViewModel.cs → src/Avalonia/Artemis.UI/Screens/Home/HomeViewModel.cs
View File

@ -1,6 +1,6 @@
using ReactiveUI;
namespace Artemis.UI.Screens.Home.ViewModels
namespace Artemis.UI.Screens.Home
{
public class HomeViewModel : MainScreenViewModel
{

2
src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisitesInstallDialogViewModel.cs → src/Avalonia/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesInstallDialogViewModel.cs
View File

@ -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<bool>
{

2
src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisitesUninstallDialogViewModel.cs → src/Avalonia/Artemis.UI/Screens/Plugins/Dialogs/PluginPrerequisitesUninstallDialogViewModel.cs
View File

@ -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<bool>
{

2
src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginFeatureView.axaml → src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureView.axaml
View File

@ -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">
<Grid ColumnDefinitions="30,*,Auto">
<Grid.ContextFlyout>
<MenuFlyout>

3
src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginFeatureView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureView.axaml.cs
View File

@ -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<PluginFeatureViewModel>
{

3
src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginFeatureViewModel.cs → src/Avalonia/Artemis.UI/Screens/Plugins/PluginFeatureViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisiteActionViewModel.cs → src/Avalonia/Artemis.UI/Screens/Plugins/PluginPrerequisiteActionViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginPrerequisiteViewModel.cs → src/Avalonia/Artemis.UI/Screens/Plugins/PluginPrerequisiteViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsView.axaml → src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml
View File

@ -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">
<Border Classes="card" Padding="15" Margin="0 5">
<Grid RowDefinitions="*,Auto" ColumnDefinitions="4*,5*">
<Grid Grid.Row="0" RowDefinitions="Auto,Auto,*" ColumnDefinitions="80,*">

3
src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsView.axaml.cs
View File

@ -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<PluginSettingsViewModel>
{

3
src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginSettingsViewModel.cs → src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsWindowView.axaml → src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml
View File

@ -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"

3
src/Avalonia/Artemis.UI/Screens/Plugins/Views/PluginSettingsWindowView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowView.axaml.cs
View File

@ -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<PluginSettingsWindowViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Plugins/ViewModels/PluginSettingsWindowViewModel.cs → src/Avalonia/Artemis.UI/Screens/Plugins/PluginSettingsWindowViewModel.cs
View File

@ -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
{

2
src/Avalonia/Artemis.UI/Screens/ProfileEditor/Views/ProfileEditorView.axaml → src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml
View File

@ -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!
</UserControl>

3
src/Avalonia/Artemis.UI/Screens/ProfileEditor/Views/ProfileEditorView.axaml.cs → src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorView.axaml.cs
View File

@ -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<ProfileEditorViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/ProfileEditor/ViewModels/ProfileEditorViewModel.cs → src/Avalonia/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
View File

@ -1,6 +1,6 @@
using Artemis.UI.Shared;
namespace Artemis.UI.Screens.ProfileEditor.ViewModels
namespace Artemis.UI.Screens.ProfileEditor
{
public class ProfileEditorViewModel : ActivatableViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/Root/Views/RootView.axaml → src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml
View File

@ -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">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="240" MinWidth="175" MaxWidth="400" />

3
src/Avalonia/Artemis.UI/Screens/Root/Views/RootView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Root/RootView.axaml.cs
View File

@ -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<RootViewModel>
{

3
src/Avalonia/Artemis.UI/Screens/Root/ViewModels/RootViewModel.cs → src/Avalonia/Artemis.UI/Screens/Root/RootViewModel.cs
View File

@ -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
{

4
src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarCategoryView.axaml → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarCategoryView.axaml
View File

@ -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">
<UserControl.Styles>
<Style Selector=":is(Button).category-button">
<Setter Property="IsVisible" Value="False" />

5
src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarCategoryView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarCategoryView.axaml.cs
View File

@ -1,9 +1,8 @@
using Artemis.UI.Screens.Root.ViewModels;
using Avalonia.Input;
using Avalonia.Input;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Root.Views
namespace Artemis.UI.Screens.Root.Sidebar
{
public class SidebarCategoryView : ReactiveUserControl<SidebarCategoryViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Root/ViewModels/SidebarCategoryViewModel.cs → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarCategoryViewModel.cs
View File

@ -6,7 +6,7 @@ using Artemis.UI.Ninject.Factories;
using Artemis.UI.Shared;
using ReactiveUI;
namespace Artemis.UI.Screens.Root.ViewModels
namespace Artemis.UI.Screens.Root.Sidebar
{
public class SidebarCategoryViewModel : ViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarProfileConfigurationView.axaml → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarProfileConfigurationView.axaml
View File

@ -6,7 +6,7 @@
xmlns:converters="clr-namespace:Artemis.UI.Converters"
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.Root.Views.SidebarProfileConfigurationView">
x:Class="Artemis.UI.Screens.Root.Sidebar.SidebarProfileConfigurationView">
<UserControl.Resources>
<converters:ValuesAdditionConverter x:Key="ValuesAddition" />
</UserControl.Resources>

2
src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarProfileConfigurationView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarProfileConfigurationView.axaml.cs
View File

@ -1,7 +1,7 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.Root.Views
namespace Artemis.UI.Screens.Root.Sidebar
{
public class SidebarProfileConfigurationView : UserControl
{

2
src/Avalonia/Artemis.UI/Screens/Root/ViewModels/SidebarProfileConfigurationViewModel.cs → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarProfileConfigurationViewModel.cs
View File

@ -2,7 +2,7 @@
using Artemis.Core.Services;
using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Root.ViewModels
namespace Artemis.UI.Screens.Root.Sidebar
{
public class SidebarProfileConfigurationViewModel : ViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarScreenView.axaml → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarScreenView.axaml
View File

@ -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.Root.Views.SidebarScreenView">
x:Class="Artemis.UI.Screens.Root.Sidebar.SidebarScreenView">
<StackPanel Orientation="Horizontal">
<avalonia:MaterialIcon Kind="{Binding Icon}" Width="16" Height="16" />
<TextBlock FontSize="12" Margin="10 0" VerticalAlignment="Center" Text="{Binding DisplayName}" />

2
src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarScreenView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarScreenView.axaml.cs
View File

@ -1,7 +1,7 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.Root.Views
namespace Artemis.UI.Screens.Root.Sidebar
{
public partial class SidebarScreenView : UserControl
{

2
src/Avalonia/Artemis.UI/Screens/Root/ViewModels/SidebarScreenViewModel.cs → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarScreenViewModel.cs
View File

@ -5,7 +5,7 @@ using Ninject;
using Ninject.Parameters;
using ReactiveUI;
namespace Artemis.UI.Screens.Root.ViewModels
namespace Artemis.UI.Screens.Root.Sidebar
{
public class SidebarScreenViewModel<T> : SidebarScreenViewModel where T : MainScreenViewModel
{

2
src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarView.axaml → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarView.axaml
View File

@ -6,7 +6,7 @@
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:svg="clr-namespace:Avalonia.Svg.Skia;assembly=Avalonia.Svg.Skia"
mc:Ignorable="d" d:DesignWidth="240" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Root.Views.SidebarView">
x:Class="Artemis.UI.Screens.Root.Sidebar.SidebarView">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="60" />

5
src/Avalonia/Artemis.UI/Screens/Root/Views/SidebarView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarView.axaml.cs
View File

@ -1,8 +1,7 @@
using Artemis.UI.Screens.Root.ViewModels;
using Avalonia.Markup.Xaml;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Root.Views
namespace Artemis.UI.Screens.Root.Sidebar
{
public class SidebarView : ReactiveUserControl<SidebarViewModel>
{

8
src/Avalonia/Artemis.UI/Screens/Root/ViewModels/SidebarViewModel.cs → src/Avalonia/Artemis.UI/Screens/Root/Sidebar/SidebarViewModel.cs
View File

@ -5,17 +5,17 @@ using System.Reactive.Disposables;
using Artemis.Core;
using Artemis.Core.Services;
using Artemis.UI.Ninject.Factories;
using Artemis.UI.Screens.Home.ViewModels;
using Artemis.UI.Screens.Home;
using Artemis.UI.Screens.Settings;
using Artemis.UI.Screens.SurfaceEditor.ViewModels;
using Artemis.UI.Screens.Workshop.ViewModels;
using Artemis.UI.Screens.SurfaceEditor;
using Artemis.UI.Screens.Workshop;
using Artemis.UI.Shared;
using Material.Icons;
using Ninject;
using ReactiveUI;
using RGB.NET.Core;
namespace Artemis.UI.Screens.Root.ViewModels
namespace Artemis.UI.Screens.Root.Sidebar
{
public class SidebarViewModel : ActivatableViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/Settings/SettingsViewModel.cs
View File

@ -1,5 +1,5 @@
using System.Collections.ObjectModel;
using Artemis.UI.Screens.Settings.Tabs.ViewModels;
using Artemis.UI.Screens.Settings.Tabs;
using Artemis.UI.Shared;
using ReactiveUI;

2
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/Views/AboutTabView.axaml → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml
View File

@ -6,7 +6,7 @@
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="1400"
x:Class="Artemis.UI.Screens.Settings.Tabs.Views.AboutTabView">
x:Class="Artemis.UI.Screens.Settings.Tabs.AboutTabView">
<ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
<StackPanel Margin="15" MaxWidth="800">
<Grid RowDefinitions="*,*" ColumnDefinitions="Auto,*,Auto">

3
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/Views/AboutTabView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/AboutTabView.axaml.cs
View File

@ -1,8 +1,7 @@
using Artemis.UI.Screens.Settings.Tabs.ViewModels;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Settings.Tabs.Views
namespace Artemis.UI.Screens.Settings.Tabs
{
public partial class AboutTabView : ReactiveUserControl<AboutTabViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/ViewModels/AboutTabViewModel.cs → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/AboutTabViewModel.cs
View File

@ -8,7 +8,7 @@ using Avalonia.Media.Imaging;
using Flurl.Http;
using ReactiveUI;
namespace Artemis.UI.Screens.Settings.Tabs.ViewModels
namespace Artemis.UI.Screens.Settings.Tabs
{
public class AboutTabViewModel : ActivatableViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/Views/DevicesTabView.axaml → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/DevicesTabView.axaml
View File

@ -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.Settings.Tabs.Views.DevicesTabView">
x:Class="Artemis.UI.Screens.Settings.Tabs.DevicesTabView">
<StackPanel MaxWidth="1050">
<TextBlock Classes="h4">Device management</TextBlock>
<TextBlock>

3
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/Views/DevicesTabView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/DevicesTabView.axaml.cs
View File

@ -1,8 +1,7 @@
using Artemis.UI.Screens.Settings.Tabs.ViewModels;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Settings.Tabs.Views
namespace Artemis.UI.Screens.Settings.Tabs
{
public class DevicesTabView : ReactiveUserControl<DevicesTabViewModel>
{

4
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/ViewModels/DevicesTabViewModel.cs → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/DevicesTabViewModel.cs
View File

@ -7,14 +7,14 @@ using System.Threading.Tasks;
using Artemis.Core;
using Artemis.Core.Services;
using Artemis.UI.Ninject.Factories;
using Artemis.UI.Screens.Device.ViewModels;
using Artemis.UI.Screens.Device;
using Artemis.UI.Shared;
using Artemis.UI.Shared.Services.Interfaces;
using Avalonia.Threading;
using DynamicData;
using ReactiveUI;
namespace Artemis.UI.Screens.Settings.Tabs.ViewModels
namespace Artemis.UI.Screens.Settings.Tabs
{
public class DevicesTabViewModel : ActivatableViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/Views/GeneralTabView.axaml → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml
View File

@ -7,7 +7,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="1000" d:DesignHeight="2400"
x:Class="Artemis.UI.Screens.Settings.Tabs.Views.GeneralTabView">
x:Class="Artemis.UI.Screens.Settings.Tabs.GeneralTabView">
<StackPanel Margin="15" MaxWidth="1000">
<!-- General settings -->

3
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/Views/GeneralTabView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/GeneralTabView.axaml.cs
View File

@ -1,8 +1,7 @@
using Artemis.UI.Screens.Settings.Tabs.ViewModels;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Settings.Tabs.Views
namespace Artemis.UI.Screens.Settings.Tabs
{
public partial class GeneralTabView : ReactiveUserControl<GeneralTabViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/ViewModels/GeneralTabViewModel.cs → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/GeneralTabViewModel.cs
View File

@ -14,7 +14,7 @@ using Artemis.UI.Shared;
using ReactiveUI;
using Serilog.Events;
namespace Artemis.UI.Screens.Settings.Tabs.ViewModels
namespace Artemis.UI.Screens.Settings.Tabs
{
public class GeneralTabViewModel : ActivatableViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/Views/PluginsTabView.axaml → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml
View File

@ -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="1200" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Settings.Tabs.Views.PluginsTabView">
x:Class="Artemis.UI.Screens.Settings.Tabs.PluginsTabView">
<Grid RowDefinitions="Auto,*" ColumnDefinitions="*,*" Width="900">
<TextBox Grid.Row="0" Grid.Column="0" Text="{Binding SearchPluginInput}" Watermark="Search plugins" Margin="0 10" />
<ItemsControl Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Items="{Binding Plugins}" />

3
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/Views/PluginsTabView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/PluginsTabView.axaml.cs
View File

@ -1,8 +1,7 @@
using Artemis.UI.Screens.Settings.Tabs.ViewModels;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Settings.Tabs.Views
namespace Artemis.UI.Screens.Settings.Tabs
{
public partial class PluginsTabView : ReactiveUserControl<PluginsTabViewModel>
{

4
src/Avalonia/Artemis.UI/Screens/Settings/Tabs/ViewModels/PluginsTabViewModel.cs → src/Avalonia/Artemis.UI/Screens/Settings/Tabs/PluginsTabViewModel.cs
View File

@ -9,14 +9,14 @@ using Artemis.Core;
using Artemis.Core.Services;
using Artemis.UI.Extensions;
using Artemis.UI.Ninject.Factories;
using Artemis.UI.Screens.Plugins.ViewModels;
using Artemis.UI.Screens.Plugins;
using Artemis.UI.Shared;
using Artemis.UI.Shared.Services.Builders;
using Artemis.UI.Shared.Services.Interfaces;
using Avalonia.Threading;
using ReactiveUI;
namespace Artemis.UI.Screens.Settings.Tabs.ViewModels
namespace Artemis.UI.Screens.Settings.Tabs
{
public class PluginsTabViewModel : ActivatableViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/Views/ListDeviceView.axaml → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/ListDeviceView.axaml
View File

@ -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.SurfaceEditor.Views.ListDeviceView">
x:Class="Artemis.UI.Screens.SurfaceEditor.ListDeviceView">
Welcome to Avalonia!
</UserControl>

2
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/Views/ListDeviceView.axaml.cs → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/ListDeviceView.axaml.cs
View File

@ -1,7 +1,7 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.SurfaceEditor.Views
namespace Artemis.UI.Screens.SurfaceEditor
{
public partial class ListDeviceView : UserControl
{

2
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/ViewModels/ListDeviceViewModel.cs → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/ListDeviceViewModel.cs
View File

@ -3,7 +3,7 @@ using Artemis.UI.Shared;
using ReactiveUI;
using SkiaSharp;
namespace Artemis.UI.Screens.SurfaceEditor.ViewModels
namespace Artemis.UI.Screens.SurfaceEditor
{
public class ListDeviceViewModel : ViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/Views/SurfaceDeviceView.axaml → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml
View File

@ -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="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.SurfaceEditor.Views.SurfaceDeviceView">
x:Class="Artemis.UI.Screens.SurfaceEditor.SurfaceDeviceView">
<Grid>
<Grid.Styles>
<Style Selector="Border.selection-border">

3
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/Views/SurfaceDeviceView.axaml.cs → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml.cs
View File

@ -1,9 +1,8 @@
using Artemis.UI.Screens.SurfaceEditor.ViewModels;
using Avalonia.Input;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.SurfaceEditor.Views
namespace Artemis.UI.Screens.SurfaceEditor
{
public class SurfaceDeviceView : ReactiveUserControl<SurfaceDeviceViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/ViewModels/SurfaceDeviceViewModel.cs → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceViewModel.cs
View File

@ -14,7 +14,7 @@ using RGB.NET.Core;
using SkiaSharp;
using Point = Avalonia.Point;
namespace Artemis.UI.Screens.SurfaceEditor.ViewModels
namespace Artemis.UI.Screens.SurfaceEditor
{
public class SurfaceDeviceViewModel : ActivatableViewModelBase
{

2
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/Views/SurfaceEditorView.axaml → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml
View File

@ -6,7 +6,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.SurfaceEditor.Views.SurfaceEditorView">
x:Class="Artemis.UI.Screens.SurfaceEditor.SurfaceEditorView">
<paz:ZoomBorder Name="ZoomBorder"
Stretch="None"

3
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/Views/SurfaceEditorView.axaml.cs → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs
View File

@ -1,4 +1,3 @@
using Artemis.UI.Screens.SurfaceEditor.ViewModels;
using Artemis.UI.Shared.Controls;
using Avalonia;
using Avalonia.Controls;
@ -8,7 +7,7 @@ using Avalonia.Markup.Xaml;
using Avalonia.Media;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.SurfaceEditor.Views
namespace Artemis.UI.Screens.SurfaceEditor
{
public class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/SurfaceEditor/ViewModels/SurfaceEditorViewModel.cs → src/Avalonia/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorViewModel.cs
View File

@ -12,7 +12,7 @@ using Avalonia.Skia;
using ReactiveUI;
using SkiaSharp;
namespace Artemis.UI.Screens.SurfaceEditor.ViewModels
namespace Artemis.UI.Screens.SurfaceEditor
{
public class SurfaceEditorViewModel : MainScreenViewModel
{

2
src/Avalonia/Artemis.UI/Screens/Workshop/Views/WorkshopView.axaml → src/Avalonia/Artemis.UI/Screens/Workshop/WorkshopView.axaml
View File

@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:builders="clr-namespace:Artemis.UI.Shared.Services.Builders;assembly=Artemis.UI.Shared"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Artemis.UI.Screens.Workshop.Views.WorkshopView">
x:Class="Artemis.UI.Screens.Workshop.WorkshopView">
<StackPanel Margin="12">
<TextBlock>Workshop!! :3</TextBlock>
<Border Classes="card" Margin="0 12">

3
src/Avalonia/Artemis.UI/Screens/Workshop/Views/WorkshopView.axaml.cs → src/Avalonia/Artemis.UI/Screens/Workshop/WorkshopView.axaml.cs
View File

@ -1,8 +1,7 @@
using Artemis.UI.Screens.Workshop.ViewModels;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Workshop.Views
namespace Artemis.UI.Screens.Workshop
{
public class WorkshopView : ReactiveUserControl<WorkshopViewModel>
{

2
src/Avalonia/Artemis.UI/Screens/Workshop/ViewModels/WorkshopViewModel.cs → src/Avalonia/Artemis.UI/Screens/Workshop/WorkshopViewModel.cs
View File

@ -3,7 +3,7 @@ using Artemis.UI.Shared.Services.Builders;
using Artemis.UI.Shared.Services.Interfaces;
using ReactiveUI;
namespace Artemis.UI.Screens.Workshop.ViewModels
namespace Artemis.UI.Screens.Workshop
{
public class WorkshopViewModel : MainScreenViewModel
{