From 8ca671fa8482ec2a6d60a123f2c83f78773f84a8 Mon Sep 17 00:00:00 2001
From: SpoinkyNL <mail@rbeekman.nl>
Date: Mon, 3 Aug 2020 22:41:32 +0200
Subject: [PATCH] Amend

---
 .../DisplayConditionGroupView.xaml            |  6 ++---
 .../DisplayConditionGroupViewModel.cs         | 23 ++++++++++---------
 .../DisplayConditionPredicateView.xaml        |  4 ++--
 .../DisplayConditionsViewModel.cs             |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml
index 6ebb2a67a..106de512a 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupView.xaml
@@ -38,8 +38,7 @@
                 Command="{s:Action Delete}">
             <materialDesign:PackIcon Kind="Close" Width="18" Height="18" />
         </Button>
-        <Button x:Name="BooleanOperatorButton"
-            Grid.Row="0"
+        <Button Grid.Row="0"
                 Grid.Column="1"
                 Style="{StaticResource DisplayConditionButtonLeftClickMenu}"
                 Background="#E74C4C"
@@ -55,7 +54,8 @@
                 </ContextMenu>
             </Button.ContextMenu>
         </Button>
-        <Button Grid.Row="0"
+        <Button x:Name="AddChildButton"
+                Grid.Row="0"
                 Grid.Column="2"
                 HorizontalAlignment="Left"
                 Foreground="#4CE758"
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs
index 9fbc43c94..9a4368f60 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionGroupViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows;
 using Artemis.Core.Models.Profile.Conditions;
 using Artemis.UI.Ninject.Factories;
 using Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions.Abstract;
@@ -10,15 +11,14 @@ using Stylet;
 
 namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
 {
-    public class DisplayConditionGroupViewModel : DisplayConditionViewModel
+    public class DisplayConditionGroupViewModel : DisplayConditionViewModel, IViewAware
     {
-        private readonly IProfileEditorService _profileEditorService;
         private readonly IDisplayConditionsVmFactory _displayConditionsVmFactory;
-        private bool _isRootGroup;
+        private readonly IProfileEditorService _profileEditorService;
         private bool _isInitialized;
-        private bool _isSelectedBooleanOperatorOpen;
+        private bool _isRootGroup;
 
-        public DisplayConditionGroupViewModel(DisplayConditionGroup displayConditionGroup, DisplayConditionViewModel parent, 
+        public DisplayConditionGroupViewModel(DisplayConditionGroup displayConditionGroup, DisplayConditionViewModel parent,
             IProfileEditorService profileEditorService, IDisplayConditionsVmFactory displayConditionsVmFactory) : base(displayConditionGroup, parent)
         {
             _profileEditorService = profileEditorService;
@@ -44,13 +44,14 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
             set => SetAndNotify(ref _isInitialized, value);
         }
 
-        public bool IsSelectedBooleanOperatorOpen
+        public string SelectedBooleanOperator => DisplayConditionGroup.BooleanOperator.Humanize();
+
+        public void AttachView(UIElement view)
         {
-            get => _isSelectedBooleanOperatorOpen;
-            set => SetAndNotify(ref _isSelectedBooleanOperatorOpen, value);
+            View = view;
         }
 
-        public string SelectedBooleanOperator => DisplayConditionGroup.BooleanOperator.Humanize();
+        public UIElement View { get; set; }
 
         public void SelectBooleanOperator(string type)
         {
@@ -65,7 +66,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
                 DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, PredicateType.Static));
             else if (type == "Dynamic")
                 DisplayConditionGroup.AddChild(new DisplayConditionPredicate(DisplayConditionGroup, PredicateType.Dynamic));
-            
+
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
         }
@@ -73,7 +74,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         public void AddGroup()
         {
             DisplayConditionGroup.AddChild(new DisplayConditionGroup(DisplayConditionGroup));
-            
+
             Update();
             _profileEditorService.UpdateSelectedProfileElement();
         }
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
index 3ceffe41e..f1ee94310 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionPredicateView.xaml
@@ -150,7 +150,7 @@
                         Command="{s:Action ActivateRightSideInputViewModel}"
                         HorizontalAlignment="Left">
                     <Grid>
-                        <StackPanel x:Name="StaticValueDisplay" Visibility="{Binding RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" Orientation="Horizontal" >
+                        <StackPanel Visibility="{Binding RightStaticValue, Converter={StaticResource NullToVisibilityConverter}}" Orientation="Horizontal" >
                             <TextBlock FontWeight="Light"
                                        Text="{Binding SelectedLeftSideProperty.PropertyDescription.Prefix}"
                                        Visibility="{Binding SelectedLeftSideProperty.PropertyDescription.Prefix, Converter={StaticResource NullToVisibilityConverter}}" />
@@ -168,7 +168,7 @@
                 <Border BorderBrush="{DynamicResource PrimaryHueMidBrush}"
                         Background="{DynamicResource MaterialDesignPaper}"
                         CornerRadius="3"
-                        Padding="3"
+                        Padding="3"                        
                         HorizontalAlignment="Left">
                     <ContentControl s:View.Model="{Binding RightSideInputViewModel}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" />
                 </Border>
diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs
index b6cce8570..1e37ff6cc 100644
--- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs
+++ b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsViewModel.cs
@@ -21,7 +21,7 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions
         public DisplayConditionsViewModel(IProfileEditorService profileEditorService, IDisplayConditionsVmFactory displayConditionsVmFactory)
         {
             _profileEditorService = profileEditorService;
-            _displayConditionsVmFactory = displayConditionsVmFactory;
+            _displayConditionsVmFactory = displayConditionsVmFactory;           
         }
 
         public int TransitionerIndex