Fixed issue with indicators

Added additional unittests Some cleanup of usings and classes
StefanKert · Mar 23, 2019 · 16f40a5 · 16f40a5
1 parent 2dc9a63
commit 16f40a5
Show file tree

Hide file tree

Showing 31 changed files with 321 additions and 220 deletions.
diff --git a/src/BuildVision.Contracts/Models/IBuildInformationModel.cs b/src/BuildVision.Contracts/Models/IBuildInformationModel.cs
@@ -1,8 +1,9 @@
 using System;
+using System.ComponentModel;
 
 namespace BuildVision.Contracts.Models
 {
-    public interface IBuildInformationModel
+    public interface IBuildInformationModel : INotifyPropertyChanged
     {
         BuildActions BuildAction { get; set; }
         DateTime? BuildFinishTime { get; set; }

diff --git a/src/BuildVision.UI/Components/ControlView.xaml b/src/BuildVision.UI/Components/ControlView.xaml
@@ -174,11 +174,14 @@
                         </Style>
                     </ListBox.Resources>
 
-                    <indicators:ErrorsIndicator Value="{Binding ErrorCount}" />
+                    <indicators:ErrorsIndicator Value="{Binding BuildInformationModel.ErrorCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.ErrorCount, UpdateSourceTrigger=PropertyChanged}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
 
-                    <indicators:WarningsIndicator Value="{Binding WarningsCount}" />
+                    <indicators:WarningsIndicator Value="{Binding BuildInformationModel.WarningsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.WarningsCount, UpdateSourceTrigger=PropertyChanged}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
 
-                    <indicators:MessagesIndicator Value="{Binding MessagesCount}" />
+                    <indicators:MessagesIndicator Value="{Binding BuildInformationModel.MessagesCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.MessagesCount, UpdateSourceTrigger=PropertyChanged}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
                 </ListBox>
 
                 <Border Grid.Column="3"
@@ -213,13 +216,18 @@
                         </Style>
                     </ListBox.Resources>
 
-                    <indicators:SuccessProjectsIndicator Value="{Binding SucceededProjectsCount}" />
+                    <indicators:SuccessProjectsIndicator Value="{Binding BuildInformationModel.SucceededProjectsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-8,0,0,0" Content="{Binding BuildInformationModel.SucceededProjectsCount}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
+
+                    <indicators:UpToDateProjectsIndicator Value="{Binding BuildInformationModel.UpToDateProjectsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.UpToDateProjectsCount}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
+
+                    <indicators:WarningProjectsIndicator Value="{Binding BuildInformationModel.WarnedProjectsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.WarnedProjectsCount}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
+
+                    <indicators:ErrorProjectsIndicator Value="{Binding BuildInformationModel.FailedProjectsCount, UpdateSourceTrigger=PropertyChanged}" />
+                    <Label Margin="-6,0,0,0" Content="{Binding BuildInformationModel.FailedProjectsCount}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4" />
 
-                    <indicators:UpToDateProjectsIndicator Value="{Binding UpToDateProjectsCount}" />
-
-                    <indicators:WarningProjectsIndicator Value="{Binding WarnedProjectsCount}" />
-
-                    <indicators:ErrorProjectsIndicator Value="{Binding FailedProjectsCount}" />
                 </ListBox>
 
             </Grid>

diff --git a/src/BuildVision.UI/Controls/BuildVisionProgressBar.xaml b/src/BuildVision.UI/Controls/BuildVisionProgressBar.xaml
@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d"
+             xmlns:contracts="clr-namespace:BuildVision.Contracts;assembly=BuildVision.Contracts"
              d:DesignWidth="697">
     <Grid>
         <Line Name="Line"
@@ -34,7 +35,7 @@
             <Line.Style>
                 <Style>
                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding ActionProgressIsVisible, FallbackValue=True}" Value="True">
+                        <DataTrigger Binding="{Binding}" Value="{x:Static contracts:BuildState.InProgress}">
                             <DataTrigger.EnterActions>
                                 <BeginStoryboard x:Name="LineProgressBeginStoryboard">
                                     <Storyboard>

diff --git a/src/BuildVision.UI/Controls/Indicators/ErrorProjectsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/ErrorProjectsIndicator.cs
@@ -16,5 +16,10 @@ public ErrorProjectsIndicator()
         {
             Header = UI.Resources.ErrorProjectsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/ErrorsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/ErrorsIndicator.cs
@@ -14,5 +14,10 @@ public ErrorsIndicator()
         {
             Header = UI.Resources.ErrorsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/MessagesIndicator.cs b/src/BuildVision.UI/Controls/Indicators/MessagesIndicator.cs
@@ -13,5 +13,10 @@ public MessagesIndicator()
         {
             Header = UI.Resources.MessagesIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/SuccessProjectsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/SuccessProjectsIndicator.cs
@@ -13,5 +13,10 @@ public SuccessProjectsIndicator()
         {
             Header = UI.Resources.SuccessProjectsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/UpToDateProjectsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/UpToDateProjectsIndicator.cs
@@ -13,5 +13,10 @@ public UpToDateProjectsIndicator()
         {
             Header = UI.Resources.UpToDateProjectsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/WarningProjectsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/WarningProjectsIndicator.cs
@@ -14,5 +14,10 @@ public WarningProjectsIndicator()
         {
             Header = UI.Resources.WarningProjectsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Controls/Indicators/WarningsIndicator.cs b/src/BuildVision.UI/Controls/Indicators/WarningsIndicator.cs
@@ -13,5 +13,10 @@ public WarningsIndicator()
         {
             Header = UI.Resources.WarningsIndicator_Header;
         }
+
+        static void OnValueChange(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            d.SetValue(ValueProperty, (long)e.NewValue);
+        }
     }
 }
diff --git a/src/BuildVision.UI/Models/BuildInformationModel.cs b/src/BuildVision.UI/Models/BuildInformationModel.cs
@@ -31,21 +31,21 @@ public int MessagesCount
         private int _succeededProjectsCount;
         public int SucceededProjectsCount
         {
-            get => _warningsCount;
+            get => _succeededProjectsCount;
             set => SetProperty(ref _succeededProjectsCount, value);
         }
 
         private int _upToDateProjectsCount;
         public int UpToDateProjectsCount
         {
-            get => _warningsCount;
+            get => _upToDateProjectsCount;
             set => SetProperty(ref _upToDateProjectsCount, value);
         }
 
         private int _failedProjectsCount;
         public int FailedProjectsCount
         {
-            get => _warningsCount;
+            get => _failedProjectsCount;
             set => SetProperty(ref _failedProjectsCount, value);
         }
 

diff --git a/src/BuildVision.UI/Themes/Generic.xaml b/src/BuildVision.UI/Themes/Generic.xaml
@@ -51,22 +51,14 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type indicators:ValueIndicator}">
                     <StackPanel Orientation="Vertical" ToolTipService.ShowOnDisabled="True" ToolTipService.ToolTip="{TemplateBinding Header}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <ContentControl 
+                        <ContentControl 
                                 Grid.Column="0"
                                 Width="16"
                                 Height="16"
                                 SnapsToDevicePixels="True"
                                 ClipToBounds="True"
                                 UseLayoutRounding="False"
                                 Template="{TemplateBinding Icon}" />
-                            <Label Grid.Column="1" Content="{TemplateBinding Value}" Foreground="{DynamicResource ToolWindowTextKey}" Opacity="0.4"/>
-
-                        </Grid>
                     </StackPanel>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/src/BuildVision/BuildVision.csproj b/src/BuildVision/BuildVision.csproj
@@ -91,6 +91,7 @@
     <Reference Include="System.Xaml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Constants\EnvDTECodeModelLanguageConstants2.cs" />
     <Compile Include="Services\BuildInformationProvider.cs" />
     <Compile Include="Services\BuildingProjectsProvider.cs" />
     <Compile Include="Services\ProjectFileNavigationService.cs" />
@@ -103,11 +104,10 @@
     <Compile Include="Services\StatusBarNotificationService.cs" />
     <Compile Include="Helpers\BuildEventContextExtensions.cs" />
     <Compile Include="Helpers\BuildMessageEventArgsExtensions.cs" />
-    <Compile Include="Helpers\EnvDTEProjectKinds.cs" />
-    <Compile Include="Helpers\ProjectItemExtensions.cs" />
+    <Compile Include="Constants\EnvDTEProjectKinds.cs" />
     <Compile Include="Helpers\SolutionProjectsExtensions.cs" />
     <Compile Include="Helpers\ProjectExtensions.cs" />
-    <Compile Include="Helpers\ProjectItemsExtensions.cs" />
+    <Compile Include="Helpers\ProjectItemExtensions.cs" />
     <Compile Include="Helpers\PropertiesExtensions.cs" />
     <Compile Include="Helpers\StateConverterHelper.cs" />
     <Compile Include="Helpers\UIHierarchyExtensions.cs" />
@@ -117,6 +117,7 @@
     <Compile Include="Tool\Building\BuildManager.cs" />
     <Compile Include="Tool\Building\BuildOutputLogger.cs" />
     <Compile Include="Core\IPackageContext.cs" />
+    <Compile Include="Tool\Building\WindowStateManager.cs" />
     <Compile Include="Tool\Views\Settings\BuildMessagesSettingsDialogPage.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -137,10 +138,9 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Core\BuildVisionPane.cs" />
-    <Compile Include="Core\PackageGuids.cs" />
+    <Compile Include="Constants\PackageGuids.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Core\PackageIds.cs" />
-    <Compile Include="Helpers\ToolWindowManager.cs" />
+    <Compile Include="Constants\PackageIds.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="VSPackage.resx">

diff --git a/src/BuildVision/Constants/EnvDTECodeModelLanguageConstants2.cs b/src/BuildVision/Constants/EnvDTECodeModelLanguageConstants2.cs
@@ -0,0 +1,7 @@
+namespace BuildVision.Helpers
+{
+    public class EnvDTECodeModelLanguageConstants2
+    {
+        public const string CMLanguageJSharp = "{E6FDF8BF-F3D1-11D4-8576-0002A516ECE8}";
+    }
+}
diff --git a/...BuildVision/Helpers/EnvDTEProjectKinds.cs → ...ildVision/Constants/EnvDTEProjectKinds.cs b/...BuildVision/Helpers/EnvDTEProjectKinds.cs → ...ildVision/Constants/EnvDTEProjectKinds.cs
diff --git a/src/BuildVision/Core/PackageGuids.cs → src/BuildVision/Constants/PackageGuids.cs b/src/BuildVision/Core/PackageGuids.cs → src/BuildVision/Constants/PackageGuids.cs
diff --git a/src/BuildVision/Core/PackageIds.cs → src/BuildVision/Constants/PackageIds.cs b/src/BuildVision/Core/PackageIds.cs → src/BuildVision/Constants/PackageIds.cs
diff --git a/src/BuildVision/Core/BuildVisionPackage.cs b/src/BuildVision/Core/BuildVisionPackage.cs
@@ -4,28 +4,17 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows;
-using BuildVision.Common;
-using BuildVision.Contracts;
 using BuildVision.Exports.Providers;
-using BuildVision.Helpers;
 using BuildVision.Tool;
-using BuildVision.Tool.Building;
-using BuildVision.Tool.Models;
 using BuildVision.UI;
 using BuildVision.UI.Common.Logging;
-using BuildVision.UI.Extensions;
-using BuildVision.UI.Helpers;
 using BuildVision.UI.Settings.Models;
-using BuildVision.UI.ViewModels;
 using BuildVision.Views.Settings;
 using EnvDTE;
 using EnvDTE80;
 using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.Settings;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Shell.Settings;
-using VSLangProj;
 using Task = System.Threading.Tasks.Task;
 
 namespace BuildVision.Core
@@ -148,7 +137,6 @@ private async void ShowToolWindowAsync(object sender, EventArgs e)
             }
         }
 
-
         ToolWindowPane ShowToolWindow(Guid windowGuid)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
@@ -184,18 +172,5 @@ public async Task ExecuteCommandAsync(string commandName)
             await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
             _dte.ExecuteCommand(commandName);
         }
-
-
-        async Task EnsurePackageLoaded(Guid packageGuid)
-        {
-            await JoinableTaskFactory.SwitchToMainThreadAsync(DisposalToken);
-
-            var shell = await GetServiceAsync(typeof(SVsShell)) as IVsShell;
-            if (shell != null)
-            {
-                IVsPackage vsPackage;
-                ErrorHandler.ThrowOnFailure(shell.LoadPackage(ref packageGuid, out vsPackage));
-            }
-        }
     }
 }
diff --git a/src/BuildVision/Helpers/ProjectExtensions.cs b/src/BuildVision/Helpers/ProjectExtensions.cs
@@ -1,28 +1,19 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-
-using EnvDTE;
-using EnvDTE80;
-
-using Microsoft.Win32;
-using VSLangProj;
 using System.Globalization;
-using Microsoft.VisualStudio.Shell.Interop;
-using System.IO;
+using System.Linq;
 using System.Text;
+using BuildVision.Contracts;
 using BuildVision.UI;
 using BuildVision.UI.Common.Logging;
-using BuildVision.Contracts;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell.Interop;
+using Microsoft.Win32;
+using VSLangProj;
 
 namespace BuildVision.Helpers
 {
-    public class EnvDTECodeModelLanguageConstants2
-    {
-        public const string CMLanguageJSharp = "{E6FDF8BF-F3D1-11D4-8576-0002A516ECE8}";
-    }
-
     public static class ProjectExtensions
     {
         private static readonly HashSet<string> _hiddenProjectsUniqueNames = new HashSet<string>