Core - Flattened namespaces

Shared UI - Flattened namespaces Shared UI - General housekeeping Project - Code cleanup
2026-11-12 03:48:56 +00:00 · 2020-09-01 00:14:08 +02:00
1 parent 029e39ec1d
commit 8718d01eae
@@ -1,5 +1,5 @@
 using System;
-using Artemis.Core.Models.Profile.Conditions.Abstract;
+using Artemis.Core;
 using Stylet;

 namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract
@@ -1,17 +1,17 @@
 <UserControl
-             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:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:s="https://github.com/canton7/Stylet"
-             xmlns:Converters="clr-namespace:Artemis.UI.Converters"
-             xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
-             x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionGroupView"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance IsDesignTimeCreatable=False, Type={x:Type local:DisplayConditionGroupViewModel}}">
+    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:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:s="https://github.com/canton7/Stylet"
+    xmlns:Converters="clr-namespace:Artemis.UI.Converters"
+    xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
+    x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionGroupView"
+    mc:Ignorable="d"
+    d:DesignHeight="450" d:DesignWidth="800"
+    d:DataContext="{d:DesignInstance IsDesignTimeCreatable=False, Type={x:Type local:DisplayConditionGroupViewModel}}">
    <UserControl.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
@@ -87,7 +87,7 @@
            <Button.ContextMenu>
                <ContextMenu>
                    <ContextMenu.Resources>
-                        <Converters:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
+                        <Converters:InverseBooleanConverter x:Key="InverseBooleanConverter" />
                    </ContextMenu.Resources>
                    <MenuItem Header="Add static condition"
                              ToolTip="A condition that compares a data model property to a static input"
@@ -108,7 +108,7 @@
                    <MenuItem Header="Add list condition"
                              ToolTip="A condition that evaluates on items in a list"
                              Command="{s:Action AddCondition}"
-                              CommandParameter="List" 
+                              CommandParameter="List"
                              IsEnabled="{Binding Data.IsListGroup, Converter={StaticResource InverseBooleanConverter}, Source={StaticResource DataContextProxy}}">
                        <MenuItem.Icon>
                            <materialDesign:PackIcon Kind="FormatListBulleted" />
@@ -2,11 +2,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Conditions;
+using Artemis.Core;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared.Services;
 using Humanizer;
 using Stylet;

@@ -130,7 +129,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
                    case DisplayConditionPredicate displayConditionPredicate:
                        if (!IsListGroup)
                            Children.Add(_displayConditionsVmFactory.DisplayConditionPredicateViewModel(displayConditionPredicate, this));
-                        break;       
+                        break;
                    case DisplayConditionListPredicate displayConditionListPredicate:
                        if (IsListGroup)
                            Children.Add(_displayConditionsVmFactory.DisplayConditionListPredicateViewModel(displayConditionListPredicate, this));
@@ -3,7 +3,6 @@
    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:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
    xmlns:s="https://github.com/canton7/Stylet"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    xmlns:converters="clr-namespace:Artemis.UI.Converters"
@@ -5,17 +5,13 @@ using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
 using System.Windows.Input;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Settings;
+using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Events;
 using Artemis.UI.Exceptions;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
-using Artemis.UI.Shared.DataModelVisualization;
-using Artemis.UI.Shared.DataModelVisualization.Shared;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using Artemis.UI.Utilities;
 using Stylet;

@@ -1,14 +1,14 @@
 <UserControl x:Class="Artemis.UI.Screens.ProfileEditor.DisplayConditions.DisplayConditionListView"
             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.ProfileEditor.DisplayConditions"
             xmlns:converters="clr-namespace:Artemis.UI.Converters"
             xmlns:utilities="clr-namespace:Artemis.UI.Utilities"
             xmlns:s="https://github.com/canton7/Stylet"
             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d" 
+             mc:Ignorable="d"
             d:DesignHeight="450" d:DesignWidth="800"
             d:DataContext="{d:DesignInstance Type=local:DisplayConditionListViewModel, IsDesignTimeCreatable=False}">
    <UserControl.Resources>
@@ -100,7 +100,7 @@
                    <MenuItem Header="Any" Command="{s:Action SelectListOperator}" CommandParameter="Any" />
                    <MenuItem Header="All" Command="{s:Action SelectListOperator}" CommandParameter="All" />
                    <MenuItem Header="None" Command="{s:Action SelectListOperator}" CommandParameter="None" />
-                    <MenuItem Header="Count (NYI)" Command="{s:Action SelectListOperator}" CommandParameter="Count" IsEnabled="False"/>
+                    <MenuItem Header="Count (NYI)" Command="{s:Action SelectListOperator}" CommandParameter="Count" IsEnabled="False" />
                </ContextMenu>
            </Button.ContextMenu>
        </Button>
@@ -3,14 +3,12 @@ using System.Collections;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Timers;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Settings;
+using Artemis.Core;
 using Artemis.Core.Services;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
-using Artemis.UI.Shared.DataModelVisualization.Shared;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using Artemis.UI.Utilities;
 using Humanizer;

@@ -3,7 +3,6 @@
    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:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
    xmlns:s="https://github.com/canton7/Stylet"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    xmlns:converters="clr-namespace:Artemis.UI.Converters"
@@ -5,16 +5,12 @@ using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
 using System.Windows.Input;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Conditions;
-using Artemis.Core.Plugins.Settings;
+using Artemis.Core;
 using Artemis.Core.Services;
-using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Events;
 using Artemis.UI.Screens.ProfileEditor.DisplayConditions.Abstract;
-using Artemis.UI.Shared.DataModelVisualization;
-using Artemis.UI.Shared.DataModelVisualization.Shared;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;
 using Artemis.UI.Utilities;
 using Stylet;

@@ -3,7 +3,6 @@
    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:local="clr-namespace:Artemis.UI.Screens.ProfileEditor.DisplayConditions"
    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
    xmlns:s="https://github.com/canton7/Stylet"
    xmlns:converters="clr-namespace:Artemis.UI.Converters"
@@ -18,7 +17,7 @@

    <materialDesign:Transitioner AutoApplyTransitionOrigins="True" SelectedIndex="{Binding TransitionerIndex}">
        <!-- Conditions intro -->
-        <materialDesign:ColorZone Mode="PrimaryDark"  VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Stretch">
+        <materialDesign:ColorZone Mode="PrimaryDark" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalContentAlignment="Stretch">
            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="32">
                <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" TextWrapping="Wrap" TextAlignment="Center" Margin="0 15">Unleash Artemis's true potential</TextBlock>
                <TextBlock TextWrapping="Wrap" TextAlignment="Center">Start using conditions to dynamically show and hide groups and layers</TextBlock>
@@ -38,7 +37,7 @@
                <RowDefinition Height="Auto" />
            </Grid.RowDefinitions>
            <TextBlock Style="{StaticResource MaterialDesignSubtitle1TextBlock}" Margin="0 0 0 -4">
-            Display conditions
+                Display conditions
            </TextBlock>
            <Separator Grid.Row="1" Grid.Column="0" Style="{StaticResource MaterialDesignDarkSeparator}" Margin="-2 0" />

@@ -65,11 +64,11 @@
                        <TextBlock.ToolTip>
                            <ToolTip Placement="Center" VerticalOffset="-30">
                                <TextBlock>
-                                Configure how the layer should act while the conditions above are met
+                                    Configure how the layer should act while the conditions above are met
                                </TextBlock>
                            </ToolTip>
                        </TextBlock.ToolTip>
-                </TextBlock>
+                    </TextBlock>
                </StackPanel>

                <materialDesign:ColorZone Grid.Row="1" Grid.Column="0" Mode="Standard" CornerRadius="3" Margin="0 0 2 0">
@@ -79,14 +78,14 @@
                            <ColumnDefinition />
                        </Grid.ColumnDefinitions>
                        <RadioButton Grid.Column="0"
-                                 Style="{StaticResource MaterialDesignTabRadioButton}"
-                                 IsChecked="{Binding DisplayContinuously}"
-                                 MinWidth="0"
-                                 Padding="5 0">
+                                     Style="{StaticResource MaterialDesignTabRadioButton}"
+                                     IsChecked="{Binding DisplayContinuously}"
+                                     MinWidth="0"
+                                     Padding="5 0">
                            <RadioButton.ToolTip>
                                <ToolTip Placement="Center" VerticalOffset="-40">
                                    <TextBlock>
-                                    Continue repeating the main segment of the timeline while the condition is met
+                                        Continue repeating the main segment of the timeline while the condition is met
                                    </TextBlock>
                                </ToolTip>
                            </RadioButton.ToolTip>
@@ -96,14 +95,14 @@
                            </StackPanel>
                        </RadioButton>
                        <RadioButton Grid.Column="1"
-                                 Style="{StaticResource MaterialDesignTabRadioButton}"
-                                 IsChecked="{Binding DisplayContinuously, Converter={StaticResource InverseBooleanConverter}}"
-                                 MinWidth="0"
-                                 Padding="5 0">
+                                     Style="{StaticResource MaterialDesignTabRadioButton}"
+                                     IsChecked="{Binding DisplayContinuously, Converter={StaticResource InverseBooleanConverter}}"
+                                     MinWidth="0"
+                                     Padding="5 0">
                            <RadioButton.ToolTip>
                                <ToolTip Placement="Center" VerticalOffset="-40">
                                    <TextBlock>
-                                    Only play the timeline once when the condition is met
+                                        Only play the timeline once when the condition is met
                                    </TextBlock>
                                </ToolTip>
                            </RadioButton.ToolTip>
@@ -122,11 +121,11 @@
                        <TextBlock.ToolTip>
                            <ToolTip Placement="Center" VerticalOffset="-30">
                                <TextBlock>
-                                Configure how the layer should act when the conditions above are no longer met
+                                    Configure how the layer should act when the conditions above are no longer met
                                </TextBlock>
                            </ToolTip>
                        </TextBlock.ToolTip>
-                </TextBlock>
+                    </TextBlock>
                </StackPanel>
                <materialDesign:ColorZone Grid.Row="1" Grid.Column="1" Mode="Standard" CornerRadius="3" Margin="2 0 0 0" HorizontalAlignment="Stretch">
                    <Grid>
@@ -135,14 +134,14 @@
                            <ColumnDefinition MinWidth="100" />
                        </Grid.ColumnDefinitions>
                        <RadioButton Grid.Column="0"
-                                 Style="{StaticResource MaterialDesignTabRadioButton}"
-                                 IsChecked="{Binding AlwaysFinishTimeline}"
-                                 MinWidth="0"
-                                 Padding="5 0">
+                                     Style="{StaticResource MaterialDesignTabRadioButton}"
+                                     IsChecked="{Binding AlwaysFinishTimeline}"
+                                     MinWidth="0"
+                                     Padding="5 0">
                            <RadioButton.ToolTip>
                                <ToolTip Placement="Center" VerticalOffset="-40">
                                    <TextBlock>
-                                    When conditions are no longer met, finish the the current run of the main timeline
+                                        When conditions are no longer met, finish the the current run of the main timeline
                                    </TextBlock>
                                </ToolTip>
                            </RadioButton.ToolTip>
@@ -152,14 +151,14 @@
                            </StackPanel>
                        </RadioButton>
                        <RadioButton Grid.Column="1"
-                                 Style="{StaticResource MaterialDesignTabRadioButton}"
-                                 IsChecked="{Binding AlwaysFinishTimeline, Converter={StaticResource InverseBooleanConverter}}"
-                                 MinWidth="0"
-                                 Padding="5 0">
+                                     Style="{StaticResource MaterialDesignTabRadioButton}"
+                                     IsChecked="{Binding AlwaysFinishTimeline, Converter={StaticResource InverseBooleanConverter}}"
+                                     MinWidth="0"
+                                     Padding="5 0">
                            <RadioButton.ToolTip>
                                <ToolTip Placement="Center" VerticalOffset="-40">
                                    <TextBlock>
-                                    When conditions are no longer met, skip to the end segment of the timeline
+                                        When conditions are no longer met, skip to the end segment of the timeline
                                    </TextBlock>
                                </ToolTip>
                            </RadioButton.ToolTip>
@@ -1,9 +1,8 @@
 using System.Linq;
-using Artemis.Core.Models.Profile;
-using Artemis.Core.Models.Profile.Conditions;
+using Artemis.Core;
 using Artemis.UI.Ninject.Factories;
-using Artemis.UI.Shared.Events;
-using Artemis.UI.Shared.Services.Interfaces;
+using Artemis.UI.Shared;
+using Artemis.UI.Shared.Services;

 namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
 {
@@ -11,11 +10,11 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
    {
        private readonly IDisplayConditionsVmFactory _displayConditionsVmFactory;
        private readonly IProfileEditorService _profileEditorService;
+        private bool _alwaysFinishTimeline;
+        private bool _displayContinuously;
        private RenderProfileElement _renderProfileElement;
        private DisplayConditionGroupViewModel _rootGroup;
        private int _transitionerIndex;
-        private bool _displayContinuously;
-        private bool _alwaysFinishTimeline;

        public DisplayConditionsViewModel(IProfileEditorService profileEditorService, IDisplayConditionsVmFactory displayConditionsVmFactory)
        {
@@ -85,7 +84,7 @@ namespace Artemis.UI.Screens.ProfileEditor.DisplayConditions
            NotifyOfPropertyChange(nameof(DisplayContinuously));
            _alwaysFinishTimeline = RenderProfileElement?.AlwaysFinishTimeline ?? false;
            NotifyOfPropertyChange(nameof(AlwaysFinishTimeline));
-            
+
            if (e.RenderProfileElement == null)
            {
                RootGroup?.Dispose();