Core - Flattened namespaces

Shared UI - Flattened namespaces
Shared UI - General housekeeping
Project - Code cleanup

src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml

@@ -6,8 +6,8 @@
              xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Debug.Tabs"
              xmlns:s="https://github.com/canton7/Stylet"
              xmlns:wpf="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:dataModel="clr-namespace:Artemis.UI.Shared.DataModelVisualization.Shared;assembly=Artemis.UI.Shared"
-             xmlns:modules="clr-namespace:Artemis.Core.Plugins.Modules;assembly=Artemis.Core"
+             xmlns:modules="clr-namespace:Artemis.Core.Modules;assembly=Artemis.Core"
+             xmlns:dataModel="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance local:DataModelDebugViewModel}">
     <Grid>
@@ -54,14 +54,13 @@
                 </ComboBox.ItemTemplate>
             </ComboBox>
         </Grid>
-        <TreeView Grid.Row="1" 
-                  ItemsSource="{Binding MainDataModel.Children}" HorizontalContentAlignment="Stretch" 
+        <TreeView Grid.Row="1"
+                  ItemsSource="{Binding MainDataModel.Children}" HorizontalContentAlignment="Stretch"
                   VirtualizingStackPanel.IsVirtualizing="True"
                   VirtualizingStackPanel.VirtualizationMode="Recycling">
             <TreeView.Resources>
                 <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource MaterialDesignTreeViewItem}">
-                    <Setter Property="IsExpanded" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}">
-                    </Setter>
+                    <Setter Property="IsExpanded" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
                 </Style>
                 <HierarchicalDataTemplate DataType="{x:Type dataModel:DataModelPropertiesViewModel}" ItemsSource="{Binding Children}">
                     <TextBlock Text="{Binding PropertyDescription.Name}" ToolTip="{Binding PropertyDescription.Description}" />

src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Timers;
-using Artemis.Core.Events;
-using Artemis.Core.Services.Interfaces;
-using Artemis.UI.Shared.DataModelVisualization.Shared;
+using Artemis.Core;
+using Artemis.Core.Modules;
+using Artemis.Core.Services;
+using Artemis.UI.Shared;
 using Artemis.UI.Shared.Services;
-using Artemis.UI.Shared.Services.Interfaces;
 using Stylet;
 
 namespace Artemis.UI.Screens.Settings.Debug.Tabs
@@ -17,9 +17,9 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
         private readonly Timer _updateTimer;
         private bool _isModuleFilterEnabled;
         private DataModelPropertiesViewModel _mainDataModel;
-        private List<Core.Plugins.Modules.Module> _modules;
+        private List<Module> _modules;
         private string _propertySearch;
-        private Core.Plugins.Modules.Module _selectedModule;
+        private Module _selectedModule;
 
         public DataModelDebugViewModel(IDataModelUIService dataModelUIService, IPluginService pluginService)
         {
@@ -42,13 +42,13 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
             set => SetAndNotify(ref _propertySearch, value);
         }
 
-        public List<Core.Plugins.Modules.Module> Modules
+        public List<Module> Modules
         {
             get => _modules;
             set => SetAndNotify(ref _modules, value);
         }
 
-        public Core.Plugins.Modules.Module SelectedModule
+        public Module SelectedModule
         {
             get => _selectedModule;
             set
@@ -110,7 +110,7 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
 
         private void PopulateModules()
         {
-            Modules = _pluginService.GetPluginsOfType<Core.Plugins.Modules.Module>().Where(p => p.Enabled).ToList();
+            Modules = _pluginService.GetPluginsOfType<Module>().Where(p => p.Enabled).ToList();
         }
     }
 }

src/Artemis.UI/Screens/Settings/Debug/Tabs/LogsDebugView.xaml

@@ -1,12 +1,10 @@
 <UserControl x:Class="Artemis.UI.Screens.Settings.Debug.Tabs.LogsDebugView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Debug.Tabs"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance local:LogsDebugViewModel}">
-    <Grid>
-            
-    </Grid>
-</UserControl>
+    <Grid />
+</UserControl>

src/Artemis.UI/Screens/Settings/Debug/Tabs/LogsDebugView.xaml.cs

@@ -1,20 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace Artemis.UI.Screens.Settings.Debug.Tabs
 {
     /// <summary>
-    /// Interaction logic for LogsDebugView.xaml
+    ///     Interaction logic for LogsDebugView.xaml
     /// </summary>
     public partial class LogsDebugView : UserControl
     {
@@ -23,4 +12,4 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
             InitializeComponent();
         }
     }
-}
+}

src/Artemis.UI/Screens/Settings/Debug/Tabs/LogsDebugViewModel.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Stylet;
+using Stylet;
 
 namespace Artemis.UI.Screens.Settings.Debug.Tabs
 {
@@ -12,4 +9,4 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
             DisplayName = "Logs";
         }
     }
-}
+}

src/Artemis.UI/Screens/Settings/Debug/Tabs/RenderDebugView.xaml

@@ -1,11 +1,11 @@
 <UserControl x:Class="Artemis.UI.Screens.Settings.Debug.Tabs.RenderDebugView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Artemis.UI.Screens.Settings.Debug.Tabs"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance local:RenderDebugViewModel}">
     <StackPanel>
         <TextBlock TextWrapping="Wrap">
@@ -32,4 +32,4 @@
             <Image Source="{Binding CurrentFrame}" />
         </materialDesign:Card>
     </StackPanel>
-</UserControl>
+</UserControl>

src/Artemis.UI/Screens/Settings/Debug/Tabs/RenderDebugViewModel.cs

@@ -2,8 +2,8 @@
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Artemis.Core.Events;
-using Artemis.Core.Services.Interfaces;
+using Artemis.Core;
+using Artemis.Core.Services;
 using SkiaSharp;
 using SkiaSharp.Views.WPF;
 using Stylet;