Updated Material Design Nuget packages

Fixed layer property tree height on different DPIs

src/Artemis.UI/Artemis.UI.csproj

@@ -55,14 +55,14 @@
     <Reference Include="Humanizer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
       <HintPath>..\packages\Humanizer.Core.2.6.2\lib\netstandard2.0\Humanizer.dll</HintPath>
     </Reference>
-    <Reference Include="MaterialDesignColors, Version=1.2.0.325, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="MaterialDesignColors, Version=1.2.2.920, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignColors.1.2.0\lib\net45\MaterialDesignColors.dll</HintPath>
+      <HintPath>..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll</HintPath>
     </Reference>
-    <Reference Include="MaterialDesignExtensions, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="MaterialDesignExtensions, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignExtensions.2.8.0\lib\net45\MaterialDesignExtensions.dll</HintPath>
+      <HintPath>..\packages\MaterialDesignExtensions.3.0.0-a03\lib\net45\MaterialDesignExtensions.dll</HintPath>
     </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=2.6.0.325, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="MaterialDesignThemes.Wpf, Version=3.0.1.920, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+      <HintPath>..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -545,6 +545,7 @@
     <Error Condition="!Exists('..\packages\Fody.6.0.5\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.0.5\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\PropertyChanged.Fody.3.1.3\build\PropertyChanged.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PropertyChanged.Fody.3.1.3\build\PropertyChanged.Fody.props'))" />
     <Error Condition="!Exists('..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets'))" />
+    <Error Condition="!Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets'))" />
   </Target>
   <Import Project="..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.68.1\build\net45\SkiaSharp.targets')" />
   <!-- The above copies OSX binaries we dont want, clean them up -->
@@ -554,4 +555,5 @@
   <Target Name="RemoveTranslationsAfterBuild" AfterTargets="AfterBuild">
     <RemoveDir Directories="@(FluentValidationExcludedCultures->'$(OutputPath)%(Filename)')" />
   </Target>
+  <Import Project="..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
 </Project>

src/Artemis.UI/Screens/Dialogs/ConfirmDialogView.xaml

@@ -10,7 +10,7 @@
              d:DesignHeight="163.274" d:DesignWidth="254.425"
              d:DataContext="{d:DesignInstance dialogs:ConfirmDialogViewModel}">
     <StackPanel Margin="16">
-        <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}" Text="{Binding Header}" TextWrapping="Wrap" />
+        <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Text="{Binding Header}" TextWrapping="Wrap" />
         <TextBlock Style="{StaticResource MaterialDesignBody1TextBlock}" Margin="0 20 0 20" Text="{Binding Text}" TextWrapping="Wrap" />
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">

src/Artemis.UI/Screens/Home/HomeView.xaml

@@ -37,7 +37,7 @@
             </Grid.ColumnDefinitions>
             <Image Source="/Resources/logo-512.png" Stretch="Uniform" Width="100" Height="100" />
             <StackPanel Grid.Column="1" Margin="24 0 0 0" VerticalAlignment="Center">
-                <TextBlock Style="{StaticResource MaterialDesignDisplay1TextBlock}" TextWrapping="Wrap">Welcome to Artemis, RGB on steroids.</TextBlock>
+                <TextBlock Style="{StaticResource MaterialDesignHeadline4TextBlock}" TextWrapping="Wrap">Welcome to Artemis, RGB on steroids.</TextBlock>
                 <Button Style="{StaticResource MaterialDesignFlatButton}"
                         Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}">
                     <StackPanel Orientation="Horizontal">
@@ -66,7 +66,7 @@
                             <materialDesign:PackIcon Kind="Discord" Width="140" Height="140"
                                                      HorizontalAlignment="Center" VerticalAlignment="Center" />
                             <StackPanel Grid.Row="0" Grid.Column="1">
-                                <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="16 16 16 8">Have a chat</TextBlock>
+                                <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="16 16 16 8">Have a chat</TextBlock>
                                 <TextBlock TextWrapping="Wrap" Margin="16 0 16 8"
                                            Foreground="{DynamicResource MaterialDesignBodyLight}"
                                            VerticalAlignment="Top">
@@ -137,7 +137,7 @@
                             <materialDesign:PackIcon Kind="GithubCircle" Width="160" Height="160"
                                                      HorizontalAlignment="Center" VerticalAlignment="Center" />
                             <StackPanel Grid.Row="0" Grid.Column="1">
-                                <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="16 16 16 8">Open Source</TextBlock>
+                                <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="16 16 16 8">Open Source</TextBlock>
                                 <TextBlock TextWrapping="Wrap" Margin="16 0 16 8"
                                            Foreground="{DynamicResource MaterialDesignBodyLight}"
                                            VerticalAlignment="Top">

src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileCreateView.xaml

@@ -8,7 +8,7 @@
              mc:Ignorable="d"
              d:DesignHeight="213.053" d:DesignWidth="254.425">
     <StackPanel Margin="16">
-        <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}">
+        <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}">
             Add a new profile
         </TextBlock>
 

src/Artemis.UI/Screens/Module/ProfileEditor/Dialogs/ProfileElementRenameView.xaml

@@ -8,7 +8,7 @@
              mc:Ignorable="d"
              d:DesignHeight="213.053" d:DesignWidth="254.425">
     <StackPanel Margin="16">
-        <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}">
+        <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}">
             Rename profile element
         </TextBlock>
 

src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml

@@ -8,7 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <TextBlock Style="{StaticResource MaterialDesignSubheadingTextBlock}" Margin="10 5 0 -4">
+            <TextBlock Style="{StaticResource MaterialDesignSubtitle1TextBlock}" Margin="10 5 0 -4">
                 Display conditions
             </TextBlock>
             <Separator Style="{StaticResource MaterialDesignDarkSeparator}" Margin="8 0" />

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesView.xaml

@@ -29,7 +29,7 @@
 
             <!-- Misc controls & time display -->
             <StackPanel Grid.Row="0" VerticalAlignment="Center">
-                <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}" Text="{Binding CurrentTime}" HorizontalAlignment="Right" Margin="0 0 20 0" />
+                <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Text="{Binding FormattedCurrentTime}" HorizontalAlignment="Right" Margin="0 0 20 0" />
             </StackPanel>
 
             <!-- Properties tree -->

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/LayerPropertiesViewModel.cs

@@ -37,6 +37,18 @@ namespace Artemis.UI.Screens.Module.ProfileEditor.LayerProperties
             }
         }
 
+        public string FormattedCurrentTime
+        {
+            get
+            {
+                if (PixelsPerSecond > 200)
+                    return $"{Math.Floor(CurrentTime.TotalSeconds):00}.{CurrentTime.Milliseconds:000}";
+                if (PixelsPerSecond > 60)
+                    return $"{Math.Floor(CurrentTime.TotalSeconds):00}.{CurrentTime.Milliseconds:000}";
+                return $"{Math.Floor(CurrentTime.TotalMinutes):0}:{CurrentTime.Seconds:00}";
+            }
+        }
+
         public int PixelsPerSecond
         {
             get => _pixelsPerSecond;

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/PropertyTree/PropertyTreeChildView.xaml

@@ -50,7 +50,7 @@
                 Margin="0,1,0,1.2"
                 Padding="0"
                 Width="80"
-                Height="Auto"
+                Height="20"
                 ToolTip="Change the property's data binding"
                 VerticalAlignment="Center">
             <TextBlock FontSize="10">DATA BINDING</TextBlock>

src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/PropertyTree/PropertyTreeView.xaml

@@ -15,7 +15,6 @@
             <Setter Property="BorderBrush" Value="{x:Null}" />
             <Setter Property="BorderThickness" Value="0" />
             <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}" />
-            <Setter Property="Padding" Value="1" />
             <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
             <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
             <Setter Property="ScrollViewer.PanningMode" Value="Both" />
@@ -32,6 +31,7 @@
                                     Background="{TemplateBinding Background}"
                                     BorderBrush="{DynamicResource MaterialDesignDivider}"
                                     BorderThickness="0,0,0,1"
+                                    Height="25"
                                     Padding="{TemplateBinding Padding}">
                                 <Grid Margin="{Binding Converter={StaticResource lengthConverter}, RelativeSource={RelativeSource TemplatedParent}}">
                                     <Grid.ColumnDefinitions>
@@ -91,17 +91,16 @@
         <TreeView.Resources>
             <!-- Parents only show their name and children -->
             <HierarchicalDataTemplate DataType="{x:Type local:PropertyTreeParentViewModel}" ItemsSource="{Binding Children}">
-                <StackPanel Height="22" Orientation="Horizontal">
+                <StackPanel Orientation="Horizontal">
                     <TextBlock Text="{Binding LayerPropertyViewModel.LayerProperty.Name}"
                                ToolTip="{Binding LayerPropertyViewModel.LayerProperty.Description}"
                                Margin="5 0"
                                VerticalAlignment="Center" />
                 </StackPanel>
-
             </HierarchicalDataTemplate>
             <!-- Children show their full view -->
-            <DataTemplate DataType="{x:Type local:PropertyTreeChildViewModel}">
+            <DataTemplate DataType="{x:Type local:PropertyTreeChildViewModel}" >
-                <ContentControl s:View.Model="{Binding}" />
+                <ContentControl s:View.Model="{Binding}"/>
             </DataTemplate>
         </TreeView.Resources>
     </TreeView>

src/Artemis.UI/Screens/Module/ProfileEditor/ProfileTree/ProfileTreeView.xaml

@@ -20,7 +20,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <StackPanel>
-            <TextBlock Style="{StaticResource MaterialDesignSubheadingTextBlock}" Margin="10 5 0 -4">
+            <TextBlock Style="{StaticResource MaterialDesignSubtitle1TextBlock}" Margin="10 5 0 -4">
                 Profile elements
             </TextBlock>
             <Separator Style="{StaticResource MaterialDesignDarkSeparator}" Margin="8 0" />

src/Artemis.UI/Screens/RootView.xaml

@@ -11,6 +11,7 @@
                     FadeContentIfInactive="False"
                     Icon="/Artemis.UI;component/Resources/logo-512.png"
                     Title="Artemis"
+                    TitleBarIcon="{StaticResource BowIcon}"
                     Foreground="{DynamicResource MaterialDesignBody}"
                     Background="{DynamicResource MaterialDesignPaper}"
                     FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
@@ -51,11 +52,12 @@
     <materialDesign:DialogHost Identifier="RootDialog">
         <materialDesign:DrawerHost IsLeftDrawerOpen="{Binding IsSidebarVisible}">
             <materialDesign:DrawerHost.LeftDrawerContent>
-                <ContentControl s:View.Model="{Binding SidebarViewModel}" Width="220" ClipToBounds="False"/>
+                <ContentControl s:View.Model="{Binding SidebarViewModel}" Width="220" ClipToBounds="False" />
             </materialDesign:DrawerHost.LeftDrawerContent>
             <DockPanel>
-                <mde:AppBar Type="Dense" IsNavigationDrawerOpen="{Binding IsSidebarVisible, Mode=TwoWay}" Title="{Binding ActiveItem.DisplayName}" ShowNavigationDrawerButton="True" DockPanel.Dock="Top" />
+                <mde:AppBar Type="Dense" IsNavigationDrawerOpen="{Binding IsSidebarVisible, Mode=TwoWay}" Title="{Binding ActiveItem.DisplayName}" ShowNavigationDrawerButton="True"
-                <ContentControl s:View.Model="{Binding ActiveItem}" IsTabStop="False"  Style="{StaticResource InitializingFade}"/>
+                            DockPanel.Dock="Top" />
+                <ContentControl s:View.Model="{Binding ActiveItem}" IsTabStop="False" Style="{StaticResource InitializingFade}" />
             </DockPanel>
         </materialDesign:DrawerHost>
     </materialDesign:DialogHost>

src/Artemis.UI/Screens/Settings/SettingsView.xaml

@@ -23,7 +23,7 @@
             <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
                 <StackPanel Margin="15" MaxWidth="800">
                     <!-- General settings -->
-                    <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0 15">General</TextBlock>
+                    <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="0 15">General</TextBlock>
                     <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
                         <StackPanel Margin="15">
                             <Grid>
@@ -134,7 +134,7 @@
                     </materialDesign:Card>
 
                     <!-- Rendering settings -->
-                    <TextBlock Style="{StaticResource MaterialDesignHeadlineTextBlock}" Margin="0 15">Rendering</TextBlock>
+                    <TextBlock Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="0 15">Rendering</TextBlock>
                     <materialDesign:Card materialDesign:ShadowAssist.ShadowDepth="Depth1" VerticalAlignment="Stretch" Margin="0,0,5,0">
                         <StackPanel Margin="15">
                             <Grid>

src/Artemis.UI/Screens/Sidebar/SidebarView.xaml

@@ -14,7 +14,7 @@
         <!-- Placeholder -->
         <StackPanel Margin="15">
             <materialDesign:PackIcon Kind="QuestionMarkCircle" Width="50" Height="50" />
-            <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}" Margin="0 15 0 0">
+            <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}" Margin="0 15 0 0">
                 Active module
             </TextBlock>
             <ComboBox BorderThickness="0" Foreground="{DynamicResource MaterialDesignNavigationItemSubheader}" materialDesign:HintAssist.Hint="Active profile">

src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceCreateView.xaml

@@ -8,7 +8,7 @@
              mc:Ignorable="d"
              d:DesignHeight="213.053" d:DesignWidth="254.425">
     <StackPanel Margin="16">
-        <TextBlock Style="{StaticResource MaterialDesignTitleTextBlock}">
+        <TextBlock Style="{StaticResource MaterialDesignHeadline6TextBlock}">
             Add a new surface layout
         </TextBlock>
 

src/Artemis.UI/Screens/SurfaceEditor/Dialogs/SurfaceDeviceConfigView.xaml

@@ -10,8 +10,8 @@
              d:DesignHeight="351.305" d:DesignWidth="262.163"
              d:DataContext="{d:DesignInstance {x:Type surfaceEditor:SurfaceDeviceConfigViewModel}}">
     <StackPanel Margin="16">
-        <TextBlock Text="{Binding Title}" Style="{StaticResource MaterialDesignTitleTextBlock}" />
+        <TextBlock Text="{Binding Title}" Style="{StaticResource MaterialDesignHeadline6TextBlock}" />
-        <TextBlock Text="Note: These are not being validated yet" Style="{StaticResource MaterialDesignSubheadingTextBlock}" />
+        <TextBlock Text="Note: These are not being validated yet" Style="{StaticResource MaterialDesignSubtitle1TextBlock}" />
         <TextBox materialDesign:HintAssist.Hint="X-coordinate" Text="{Binding X}" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Margin="0 10" />
 
         <TextBox materialDesign:HintAssist.Hint="Y-coordinate" Text="{Binding Y}" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Margin="0 10" />

src/Artemis.UI/packages.config

@@ -5,9 +5,9 @@
   <package id="Fody" version="6.0.5" targetFramework="net472" developmentDependency="true" />
   <package id="gong-wpf-dragdrop" version="2.1.0" targetFramework="net472" />
   <package id="Humanizer.Core" version="2.6.2" targetFramework="net461" />
-  <package id="MaterialDesignColors" version="1.2.0" targetFramework="net472" />
+  <package id="MaterialDesignColors" version="1.2.2" targetFramework="net472" />
-  <package id="MaterialDesignExtensions" version="2.8.0" targetFramework="net472" />
+  <package id="MaterialDesignExtensions" version="3.0.0-a03" targetFramework="net472" />
-  <package id="MaterialDesignThemes" version="2.6.0" targetFramework="net472" />
+  <package id="MaterialDesignThemes" version="3.0.1" targetFramework="net472" />
   <package id="Ninject" version="3.3.4" targetFramework="net461" />
   <package id="Ninject.Extensions.Conventions" version="3.3.0" targetFramework="net461" />
   <package id="Ninject.Extensions.Factory" version="3.3.2" targetFramework="net461" />