UI - Implemented routing

src/Artemis.UI.Avalonia/App.axaml

@@ -2,8 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:Artemis.UI.Avalonia"
              xmlns:sty="using:FluentAvalonia.Styling"
-             xmlns:ui="using:FluentAvalonia.UI.Controls"
-             xmlns:uip="using:FluentAvalonia.UI.Controls.Primitives"
              x:Class="Artemis.UI.Avalonia.App">
     <Application.DataTemplates>
         <local:ViewLocator />
@@ -20,7 +18,7 @@
         <StyleInclude Source="avares://Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml" />
 
         <!-- Global styles -->
-        <StyleInclude Source="/Styles/Button.axaml"></StyleInclude>
+        <StyleInclude Source="/Styles/Button.axaml" />
-        <StyleInclude Source="/Styles/Sidebar.axaml"></StyleInclude>
+        <StyleInclude Source="/Styles/Sidebar.axaml" />
     </Application.Styles>
 </Application>

src/Artemis.UI.Avalonia/Artemis.UI.Avalonia.csproj

@@ -8,10 +8,6 @@
 		<Folder Include="Controls\" />
 		<Folder Include="Models\" />
 		<AvaloniaResource Include="Assets\**" />
-    <Folder Include="Screens\Home\Views" />
-    <Folder Include="Screens\Settings\Views" />
-    <Folder Include="Screens\SurfaceEditor\Views" />
-    <Folder Include="Screens\Workshop\Views" />
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Avalonia" Version="0.10.7" />

src/Artemis.UI.Avalonia/Converters/ColorToSolidColorBrushConverter.cs

@@ -14,7 +14,6 @@ namespace Artemis.UI.Avalonia.Converters
         /// <inheritdoc />
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            
             return new SolidColorBrush(!(value is RGBColor color)
                 ? new Color(0, 0, 0, 0)
                 : new Color((byte) color.A, (byte) color.R, (byte) color.G, (byte) color.B));

src/Artemis.UI.Avalonia/Converters/EnumToCollectionConverter.cs

@@ -8,19 +8,8 @@ using Avalonia.Markup.Xaml;
 
 namespace Artemis.UI.Avalonia.Converters
 {
-
     public class EnumToCollectionConverter : MarkupExtension, IValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return GetAllValuesAndDescriptions(value.GetType());
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return null;
-        }
-
         public override object ProvideValue(IServiceProvider serviceProvider)
         {
             return this;
@@ -44,5 +33,15 @@ namespace Artemis.UI.Avalonia.Converters
 
             return Enum.GetValues(t).Cast<Enum>().Select(e => new Tuple<object, object>(e, Description(e))).ToList();
         }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return GetAllValuesAndDescriptions(value.GetType());
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
     }
 }

src/Artemis.UI.Avalonia/Converters/ValuesAdditionConverter.cs

@@ -8,7 +8,6 @@ namespace Artemis.UI.Avalonia.Converters
 {
     public class ValuesAdditionConverter : IMultiValueConverter
     {
-
         /// <inheritdoc />
         public object Convert(IList<object> values, Type targetType, object parameter, CultureInfo culture)
         {

src/Artemis.UI.Avalonia/MainWindow.axaml

@@ -2,7 +2,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         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.Avalonia.MainWindow"
         Icon="/Assets/avalonia-logo.ico"

src/Artemis.UI.Avalonia/MainWindow.axaml.cs

@@ -5,7 +5,7 @@ using Avalonia.ReactiveUI;
 
 namespace Artemis.UI.Avalonia
 {
-    public partial class MainWindow : ReactiveWindow<RootViewModel>
+    public class MainWindow : ReactiveWindow<RootViewModel>
     {
         public MainWindow()
         {

src/Artemis.UI.Avalonia/Ninject/Factories/IVMFactory.cs

@@ -1,5 +1,6 @@
 using Artemis.Core;
 using Artemis.UI.Avalonia.Screens.Root.ViewModels;
+using ReactiveUI;
 
 namespace Artemis.UI.Avalonia.Ninject.Factories
 {
@@ -9,6 +10,7 @@ namespace Artemis.UI.Avalonia.Ninject.Factories
 
     public interface ISidebarVmFactory : IVmFactory
     {
+        SidebarViewModel SidebarViewModel(IScreen hostScreen);
         SidebarCategoryViewModel SidebarCategoryViewModel(ProfileCategory profileCategory);
         SidebarProfileConfigurationViewModel SidebarProfileConfigurationViewModel(ProfileConfiguration profileConfiguration);
     }

src/Artemis.UI.Avalonia/Program.cs

@@ -1,29 +1,29 @@
-using System;
+using Avalonia;
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.ReactiveUI;
 using Ninject;
-using ReactiveUI;
-using Splat;
-using Splat.Ninject;
 
 namespace Artemis.UI.Avalonia
 {
-    class Program
+    internal class Program
     {
         private static StandardKernel _kernel;
 
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
-        public static void Main(string[] args) => BuildAvaloniaApp()
+        public static void Main(string[] args)
+        {
+            BuildAvaloniaApp()
                 .StartWithClassicDesktopLifetime(args);
+        }
 
         // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()
-            => AppBuilder.Configure<App>()
+        {
+            return AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .LogToTrace()
                 .UseReactiveUI();
         }
     }
+}

src/Artemis.UI.Avalonia/Screens/Home/ViewModels/HomeViewModel.cs

@@ -4,14 +4,9 @@ namespace Artemis.UI.Avalonia.Screens.Home.ViewModels
 {
     public class HomeViewModel : MainScreenViewModel
     {
-        public HomeViewModel(IScreen hostScreens) : base(hostScreens, "home")
+        public HomeViewModel(IScreen hostScreen) : base(hostScreen, "home")
         {
             DisplayName = "Home";
         }
-
-        public void OpenUrl(string url)
-        {
-            Core.Utilities.OpenUrl(url);
-        }
     }
 }

src/Artemis.UI.Avalonia/Screens/Home/Views/HomeView.axaml

@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             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.Avalonia.Screens.Home.Views.HomeView">
+    Home :>
+</UserControl>

src/Artemis.UI.Avalonia/Screens/Home/Views/HomeView.axaml.cs

@@ -0,0 +1,19 @@
+using Artemis.UI.Avalonia.Screens.Home.ViewModels;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Avalonia.Screens.Home.Views
+{
+    public class HomeView : ReactiveUserControl<HomeViewModel>
+    {
+        public HomeView()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

src/Artemis.UI.Avalonia/Screens/MainScreenViewModel.cs

@@ -2,7 +2,7 @@
 
 namespace Artemis.UI.Avalonia.Screens
 {
-    public abstract class MainScreenViewModel : ViewModelBase, IRoutableViewModel
+    public abstract class MainScreenViewModel : ActivatableViewModelBase, IRoutableViewModel
     {
         protected MainScreenViewModel(IScreen hostScreen, string urlPathSegment)
         {

src/Artemis.UI.Avalonia/Screens/ProfileEditor/ViewModels/ProfileEditorViewModel.cs

@@ -0,0 +1,6 @@
+namespace Artemis.UI.Avalonia.Screens.ProfileEditor.ViewModels
+{
+    public class ProfileEditorViewModel : ActivatableViewModelBase
+    {
+    }
+}

src/Artemis.UI.Avalonia/Screens/ProfileEditor/Views/ProfileEditorView.axaml

@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             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.Avalonia.Screens.ProfileEditor.Views.ProfileEditorView">
+  Welcome to Avalonia!
+</UserControl>

src/Artemis.UI.Avalonia/Screens/ProfileEditor/Views/ProfileEditorView.axaml.cs

@@ -0,0 +1,19 @@
+using Artemis.UI.Avalonia.Screens.ProfileEditor.ViewModels;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Avalonia.Screens.ProfileEditor.Views
+{
+    public class ProfileEditorView : ReactiveUserControl<ProfileEditorViewModel>
+    {
+        public ProfileEditorView()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

src/Artemis.UI.Avalonia/Screens/Root/ViewModels/RootViewModel.cs

@@ -1,19 +1,17 @@
-using System;
+using Artemis.Core.Services;
-using System.Reactive;
+using Artemis.UI.Avalonia.Ninject.Factories;
-using Artemis.Core.Services;
 using ReactiveUI;
 
 namespace Artemis.UI.Avalonia.Screens.Root.ViewModels
 {
-    public class RootViewModel : ViewModelBase, IScreen, IActivatableViewModel
+    public class RootViewModel : ActivatableViewModelBase, IScreen
     {
         private readonly ICoreService _coreService;
 
-        public RootViewModel(ICoreService coreService, SidebarViewModel sidebarViewModel)
+        public RootViewModel(ICoreService coreService, ISidebarVmFactory sidebarVmFactory)
         {
             Router = new RoutingState();
-            SidebarViewModel = sidebarViewModel;
+            SidebarViewModel = sidebarVmFactory.SidebarViewModel(this);
-            SidebarViewModel.Router = Router;
 
             _coreService = coreService;
             _coreService.Initialize();
@@ -21,9 +19,6 @@ namespace Artemis.UI.Avalonia.Screens.Root.ViewModels
 
         public SidebarViewModel SidebarViewModel { get; }
 
-        /// <inheritdoc />
-        public ViewModelActivator Activator { get; } = new();
-
         /// <inheritdoc />
         public RoutingState Router { get; }
     }

src/Artemis.UI.Avalonia/Screens/Root/ViewModels/SidebarScreenViewModel.cs

@@ -1,7 +1,7 @@
 using System;
-using System.Reactive.Linq;
 using Material.Icons;
 using Ninject;
+using Ninject.Parameters;
 using ReactiveUI;
 
 namespace Artemis.UI.Avalonia.Screens.Root.ViewModels
@@ -12,9 +12,11 @@ namespace Artemis.UI.Avalonia.Screens.Root.ViewModels
         {
         }
 
-        public override MainScreenViewModel CreateInstance(IKernel kernel)
+        public override Type ScreenType => typeof(T);
+
+        public override MainScreenViewModel CreateInstance(IKernel kernel, IScreen screen)
         {
-            return kernel.Get<T>();
+            return kernel.Get<T>(new ConstructorArgument("hostScreen", screen));
         }
     }
 
@@ -29,7 +31,8 @@ namespace Artemis.UI.Avalonia.Screens.Root.ViewModels
         public MaterialIconKind Icon { get; }
         public string DisplayName { get; }
 
-        public abstract MainScreenViewModel CreateInstance(IKernel kernel);
+        public abstract Type ScreenType { get; }
+        public abstract MainScreenViewModel CreateInstance(IKernel kernel, IScreen screen);
 
         public bool IsActive(IObservable<IRoutableViewModel?> routerCurrentViewModel)
         {

src/Artemis.UI.Avalonia/Screens/Root/ViewModels/SidebarViewModel.cs

@@ -1,5 +1,7 @@
-using System.Collections.ObjectModel;
+using System;
+using System.Collections.ObjectModel;
 using System.Linq;
+using System.Reactive.Disposables;
 using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Avalonia.Ninject.Factories;
@@ -14,20 +16,19 @@ using RGB.NET.Core;
 
 namespace Artemis.UI.Avalonia.Screens.Root.ViewModels
 {
-    public class SidebarViewModel : ViewModelBase
+    public class SidebarViewModel : ActivatableViewModelBase
     {
-        private readonly IKernel _kernel;
+        private readonly IScreen _hostScreen;
         private readonly IProfileService _profileService;
         private readonly IRgbService _rgbService;
         private readonly ISidebarVmFactory _sidebarVmFactory;
         private ArtemisDevice? _headerDevice;
 
-        private SidebarScreenViewModel _selectedSidebarScreen;
+        private SidebarScreenViewModel? _selectedSidebarScreen;
-        private RoutingState _router;
 
-        public SidebarViewModel(IKernel kernel, IProfileService profileService, IRgbService rgbService, ISidebarVmFactory sidebarVmFactory)
+        public SidebarViewModel(IScreen hostScreen, IKernel kernel, IProfileService profileService, IRgbService rgbService, ISidebarVmFactory sidebarVmFactory)
         {
-            _kernel = kernel;
+            _hostScreen = hostScreen;
             _profileService = profileService;
             _rgbService = rgbService;
             _sidebarVmFactory = sidebarVmFactory;
@@ -43,6 +44,17 @@ namespace Artemis.UI.Avalonia.Screens.Root.ViewModels
 
             UpdateProfileCategories();
             UpdateHeaderDevice();
+
+            this.WhenActivated(disposables =>
+            {
+                this.WhenAnyObservable(vm => vm._hostScreen.Router.CurrentViewModel)
+                    .WhereNotNull()
+                    .Subscribe(c => SelectedSidebarScreen = SidebarScreens.FirstOrDefault(s => s.ScreenType == c.GetType()))
+                    .DisposeWith(disposables);
+                this.WhenAnyValue(vm => vm.SelectedSidebarScreen)
+                    .WhereNotNull()
+                    .Subscribe(s => _hostScreen.Router.Navigate.Execute(s.CreateInstance(kernel, _hostScreen)));
+            });
         }
 
         public ObservableCollection<SidebarScreenViewModel> SidebarScreens { get; }
@@ -54,21 +66,10 @@ namespace Artemis.UI.Avalonia.Screens.Root.ViewModels
             set => this.RaiseAndSetIfChanged(ref _headerDevice, value);
         }
 
-        public SidebarScreenViewModel SelectedSidebarScreen
+        public SidebarScreenViewModel? SelectedSidebarScreen
         {
             get => _selectedSidebarScreen;
-            set
+            set => this.RaiseAndSetIfChanged(ref _selectedSidebarScreen, value);
-            {
-                this.RaiseAndSetIfChanged(ref _selectedSidebarScreen, value);
-                // if (!SelectedSidebarScreen.IsActive(Router.CurrentViewModel))
-                //     Router.Navigate.Execute(SelectedSidebarScreen.CreateInstance(_kernel)).Subscribe();
-            }
-        }
-
-        public RoutingState Router
-        {
-            get => _router;
-            set => this.RaiseAndSetIfChanged(ref _router, value);
         }
 
         public SidebarCategoryViewModel AddProfileCategoryViewModel(ProfileCategory profileCategory)

src/Artemis.UI.Avalonia/Screens/Root/Views/RootView.axaml

@@ -23,6 +23,11 @@
         </ExperimentalAcrylicBorder>
 
         <Border Grid.Column="1" Background="#101010" IsHitTestVisible="False" />
-        <reactiveUi:RoutedViewHost Grid.Column="1" Router="{Binding Router}" Margin="0 20 0 0" Padding="15" />
+
+        <reactiveUi:RoutedViewHost Grid.Column="1" Margin="0 20 0 0" Padding="15" Router="{Binding Router}">
+            <reactiveUi:RoutedViewHost.PageTransition>
+                <CrossFade Duration="0.1" />
+            </reactiveUi:RoutedViewHost.PageTransition>
+        </reactiveUi:RoutedViewHost>
     </Grid>
 </UserControl>

src/Artemis.UI.Avalonia/Screens/Root/Views/SidebarCategoryView.axaml

@@ -8,10 +8,10 @@
              x:Class="Artemis.UI.Avalonia.Screens.Root.Views.SidebarCategoryView">
     <UserControl.Styles>
         <Style Selector=":is(Button).category-button">
-            <Setter Property="IsVisible" Value="False"></Setter>
+            <Setter Property="IsVisible" Value="False" />
         </Style>
         <Style Selector="Grid#ContainerGrid:pointerover :is(Button).category-button">
-            <Setter Property="IsVisible" Value="True"></Setter>
+            <Setter Property="IsVisible" Value="True" />
         </Style>
 
         <Style Selector="avalonia|MaterialIcon.chevron-collapsed">

src/Artemis.UI.Avalonia/Screens/Root/Views/SidebarProfileConfigurationView.axaml

@@ -77,8 +77,7 @@
                                            VerticalAlignment="Center"
                                            ConfigurationIcon="{Binding ProfileConfiguration.Icon}"
                                            Width="20"
-                                         Height="20">
+                                           Height="20" />
-        </controls:ProfileConfigurationIcon>
 
         <TextBlock Grid.Column="1"
                    x:Name="ProfileName"

src/Artemis.UI.Avalonia/Screens/Root/Views/SidebarView.axaml

@@ -39,8 +39,8 @@
                 </shared:DeviceVisualizer>
                 <Border.OpacityMask>
                     <LinearGradientBrush StartPoint="0,0" EndPoint="0,60">
-                        <GradientStop Color="White" Offset="0"></GradientStop>
+                        <GradientStop Color="White" Offset="0" />
-                        <GradientStop Color="Transparent" Offset="1"></GradientStop>
+                        <GradientStop Color="Transparent" Offset="1" />
                     </LinearGradientBrush>
                 </Border.OpacityMask>
             </Border>

src/Artemis.UI.Avalonia/Screens/Root/Views/SidebarView.axaml.cs

@@ -1,9 +1,10 @@
-using Avalonia.Controls;
+using Artemis.UI.Avalonia.Screens.Root.ViewModels;
 using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
 
 namespace Artemis.UI.Avalonia.Screens.Root.Views
 {
-    public class SidebarView : UserControl
+    public class SidebarView : ReactiveUserControl<SidebarViewModel>
     {
         public SidebarView()
         {

src/Artemis.UI.Avalonia/Screens/Settings/ViewModels/SurfaceEditorViewModel.cs

@@ -4,7 +4,7 @@ namespace Artemis.UI.Avalonia.Screens.Settings.ViewModels
 {
     public class SettingsViewModel : MainScreenViewModel
     {
-        public SettingsViewModel(IScreen hostScreens) : base(hostScreens, "settings")
+        public SettingsViewModel(IScreen hostScreen) : base(hostScreen, "settings")
         {
             DisplayName = "Settings";
         }

src/Artemis.UI.Avalonia/Screens/Settings/Views/SettingsView.axaml

@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             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.Avalonia.Screens.Settings.Views.SettingsView">
+    Settings! :D
+</UserControl>

src/Artemis.UI.Avalonia/Screens/Settings/Views/SettingsView.axaml.cs

@@ -0,0 +1,19 @@
+using Artemis.UI.Avalonia.Screens.Settings.ViewModels;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Avalonia.Screens.Settings.Views
+{
+    public class SettingsView : ReactiveUserControl<SettingsViewModel>
+    {
+        public SettingsView()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

src/Artemis.UI.Avalonia/Screens/SurfaceEditor/ViewModels/SurfaceEditorViewModel.cs

@@ -4,7 +4,7 @@ namespace Artemis.UI.Avalonia.Screens.SurfaceEditor.ViewModels
 {
     public class SurfaceEditorViewModel : MainScreenViewModel
     {
-        public SurfaceEditorViewModel(IScreen hostScreens) : base(hostScreens, "surface-editor")
+        public SurfaceEditorViewModel(IScreen hostScreen) : base(hostScreen, "surface-editor")
         {
             DisplayName = "Surface Editor";
         }

src/Artemis.UI.Avalonia/Screens/SurfaceEditor/Views/SurfaceEditorView.axaml

@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             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.Avalonia.Screens.SurfaceEditor.Views.SurfaceEditorView">
+    Surface editor c:
+</UserControl>

src/Artemis.UI.Avalonia/Screens/SurfaceEditor/Views/SurfaceEditorView.axaml.cs

@@ -0,0 +1,19 @@
+using Artemis.UI.Avalonia.Screens.SurfaceEditor.ViewModels;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Avalonia.Screens.SurfaceEditor.Views
+{
+    public class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewModel>
+    {
+        public SurfaceEditorView()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

src/Artemis.UI.Avalonia/Screens/Workshop/ViewModels/WorkshopViewModel.cs

@@ -4,7 +4,7 @@ namespace Artemis.UI.Avalonia.Screens.Workshop.ViewModels
 {
     public class WorkshopViewModel : MainScreenViewModel
     {
-        public WorkshopViewModel(IScreen hostScreens) : base(hostScreens, "workshop")
+        public WorkshopViewModel(IScreen hostScreen) : base(hostScreen, "workshop")
         {
             DisplayName = "Workshop";
         }

src/Artemis.UI.Avalonia/Screens/Workshop/Views/WorkshopView.axaml

@@ -0,0 +1,8 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             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.Avalonia.Screens.Workshop.Views.WorkshopView">
+    Workshop!! :3
+</UserControl>

src/Artemis.UI.Avalonia/Screens/Workshop/Views/WorkshopView.axaml.cs

@@ -0,0 +1,19 @@
+using Artemis.UI.Avalonia.Screens.Workshop.ViewModels;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Artemis.UI.Avalonia.Screens.Workshop.Views
+{
+    public class WorkshopView : ReactiveUserControl<WorkshopViewModel>
+    {
+        public WorkshopView()
+        {
+            InitializeComponent();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
+}

src/Artemis.UI.Avalonia/Styles/Button.axaml

@@ -8,17 +8,17 @@
             <StackPanel>
                 <TextBlock Margin="0 5 0 0">Button.icon-button</TextBlock>
                 <Button Classes="icon-button">
-                    <avalonia:MaterialIcon Kind="Cog"></avalonia:MaterialIcon>
+                    <avalonia:MaterialIcon Kind="Cog" />
                 </Button>
 
                 <TextBlock Margin="0 5 0 0">Button.icon-button icon-button-small</TextBlock>
                 <Button Classes="icon-button icon-button-small">
-                    <avalonia:MaterialIcon Kind="Cog"></avalonia:MaterialIcon>
+                    <avalonia:MaterialIcon Kind="Cog" />
                 </Button>
 
                 <TextBlock Margin="0 5 0 0">ToggleButton.icon-button</TextBlock>
                 <ToggleButton Classes="icon-button">
-                    <avalonia:MaterialIcon Kind="Cog"></avalonia:MaterialIcon>
+                    <avalonia:MaterialIcon Kind="Cog" />
                 </ToggleButton>
 
                 <TextBlock Margin="0 5 0 0">HyperlinkButton.icon-button</TextBlock>
@@ -36,7 +36,7 @@
 
     <!-- Styles -->
     <Style Selector=":is(Button).icon-button">
-        <Setter Property="BorderBrush" Value="Transparent"></Setter>
+        <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="5.5" />
     </Style>
@@ -45,8 +45,8 @@
         <Setter Property="Padding" Value="2" />
     </Style>
     <Style Selector=":is(Button).icon-button-small avalonia|MaterialIcon">
-        <Setter Property="Width" Value="14"></Setter>
+        <Setter Property="Width" Value="14" />
-        <Setter Property="Height" Value="14"></Setter>
+        <Setter Property="Height" Value="14" />
     </Style>
 
     <Style Selector="controls|HyperlinkButton.icon-button">

src/Artemis.UI.Avalonia/Styles/Sidebar.axaml

@@ -1,6 +1,5 @@
 <Styles xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-        xmlns:views="clr-namespace:Artemis.UI.Avalonia.Screens.Root.Views">
     <Design.PreviewWith>
         <Border Padding="20">
             <ListBox Classes="sidebar-listbox">
@@ -14,7 +13,7 @@
 
     <!-- Add Styles Here -->
     <Style Selector="ListBox.sidebar-listbox ListBoxItem">
-        <Setter Property="Margin" Value="0 2.5"></Setter>
+        <Setter Property="Margin" Value="0 2.5" />
-        <Setter Property="MinHeight" Value="35"></Setter>
+        <Setter Property="MinHeight" Value="35" />
     </Style>
 </Styles>

src/Artemis.UI.Avalonia/ViewModelBase.cs

@@ -2,7 +2,7 @@
 
 namespace Artemis.UI.Avalonia
 {
-    public class ViewModelBase : ReactiveObject
+    public abstract class ViewModelBase : ReactiveObject
     {
         private string? _displayName;
 
@@ -12,4 +12,9 @@ namespace Artemis.UI.Avalonia
             set => this.RaiseAndSetIfChanged(ref _displayName, value);
         }
     }
+
+    public abstract class ActivatableViewModelBase : ViewModelBase, IActivatableViewModel
+    {
+        public ViewModelActivator Activator { get; } = new();
+    }
 }