Update (#1)

* Fixes MaterialDesignInXAML#746 Allowing the option for projects to opt-into having the font files copied locally rather than used as an embedded resource. No longer setting font for DailogHost No longer setting font for Toolbar. * Icons update from Azure pipeline (MaterialDesignInXAML#1534) * Cleanup pipeline (MaterialDesignInXAML#1538) * WIP cleaning up build pipeline since we no longer need AppVeyor. * Parameterizing the nuget to make local builds easier. * Fixing license url Fixing framework dependency groups * Script and nuspec updates to handle the icons * Fixing dependency group * Moving build script and adding all NuGets * Adding netcore target to nuget package. * Adding default dependency group * Updating build pipeline to build NuGet packages. * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * Fixing TextAlignment for NumericUpDown control (MaterialDesignInXAML#1540) * Change Calendar TodayBackground to Transparent with a circle around it (MaterialDesignInXAML#1446) * Change Calendar TodayBackground to SecondaryAccentBrush * Update Current date to a Transparent circle with black border like in https://material.io/components/pickers/ * Change TodayBackground Stroke color to Foreground color * Fix the text for current date is always black * Default IsMonitoring to true (MaterialDesignInXAML#1541) This is needed for MahApps attached properties to register for events to respond to things like SelectAllOnFocus. Fixes MaterialDesignInXAML#1539 * Filled and Outlined DatePicker styles (MaterialDesignInXAML#1501) * Filled and Outlined DatePicker styles * Removed redundant setter * Forward attached properites Inherited attached properties can have performance implications. So instead we simply forward them as needed. * Icons update from Azure pipeline (MaterialDesignInXAML#1544) * Custom Thumb Control and ControlTemplate to fix issue MaterialDesignInXAML#1531 (MaterialDesignInXAML#1542) * Created Custom Thumb to override the cursor when dragging. Created ControlTemplate for Thumb that sets cursor to SizeWE * Implemented code review suggested changes GridViewColumnThumb is now internal. Created a new style explicitly for the GridView Column. GridViewColumnHeader now uses this new style. * Fixed foreground brush on Light, Dark and Accent versions of CheckBox and RadioButton styles (MaterialDesignInXAML#1543) * Fixing the underline behavior of the numeric up down control (MaterialDesignInXAML#1547) * Fixing nuget minor version. (MaterialDesignInXAML#1548) * Another attempted fix for MaterialDesignInXAML#746 * Updating demo to use the markup extension * Renaming file to match class name
GBSDS · Dec 11, 2019 · 66179a9 · 66179a9
1 parent ed34d70
commit 66179a9
Show file tree

Hide file tree

Showing 37 changed files with 842 additions and 496 deletions.
diff --git a/MahMaterialDragablzMashUp/Mah.xaml b/MahMaterialDragablzMashUp/Mah.xaml
@@ -40,7 +40,7 @@
             <TabItem Header="NumericUpDown">
                 <StackPanel>
                     <controls:NumericUpDown Margin="5" Value="{Binding UpDownValue, ValidatesOnExceptions=True}"/>
-                    <controls:NumericUpDown Culture="ar-EG" FlowDirection="RightToLeft" Margin="5"/>
+                    <controls:NumericUpDown Culture="ar-EG" FlowDirection="RightToLeft" Margin="5" controls:TextBoxHelper.SelectAllOnFocus="True"/>
                 </StackPanel>
             </TabItem>
             <TabItem Header="DataGrid">
@@ -66,6 +66,8 @@
                         <mdix:DataGridComboBoxColumn Header="Combo" SelectedItemBinding="{Binding EnumValue}" ItemsSource="{Binding Source={StaticResource EnumValues}}"/>
                         <controls:DataGridNumericUpDownColumn Binding="{Binding IntValue}"
                                                               Header="Numeric"
+                                                              Width="300"
+                                                              TextAlignment="Center"
                                                               Minimum="0"
                                                               StringFormat="{}{0} km" />
                     </DataGrid.Columns>

diff --git a/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj b/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj
@@ -2,27 +2,15 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net45</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>
     <UseWPF>true</UseWPF>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyTitle>MahMaterialDragablzMashUp</AssemblyTitle>
     <Product>MahMaterialDragablzMashUp</Product>
-    <Copyright>Copyright ©  2015</Copyright>
+    <Copyright>Copyright ©  2019</Copyright>
     <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
-    <Configurations>Debug;Release;AppVeyor</Configurations>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppVeyor|Any CPU'">
-    <OutputPath>bin\AppVeyor\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
@@ -36,10 +24,5 @@
   <ItemGroup>
     <Resource Include="Resources\ProfilePic.jpg" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="obj\AppVeyor\Dialogs.g.cs" />
-    <Compile Remove="obj\AppVeyor\FlyoutContent.g.cs" />
-    <Compile Remove="obj\AppVeyor\Mah.g.cs" />
-  </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/MainDemo.Wpf/MainWindow.xaml b/MainDemo.Wpf/MainWindow.xaml
@@ -12,7 +12,8 @@
         TextOptions.TextFormattingMode="Ideal" 
         TextOptions.TextRenderingMode="Auto"
         Background="{DynamicResource MaterialDesignPaper}"
-        FontFamily="{StaticResource MaterialDesignFont}" Icon="favicon.ico">
+        FontFamily="{materialDesign:MaterialDesignFont}" 
+        Icon="favicon.ico">
     <Window.CommandBindings>
         <CommandBinding Command="Copy" Executed="OnCopy"></CommandBinding>
     </Window.CommandBindings>

diff --git a/MainDemo.Wpf/MaterialDesignDemo.csproj b/MainDemo.Wpf/MaterialDesignDemo.csproj
@@ -7,26 +7,17 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyTitle>MaterialDesignColors.WpfExample</AssemblyTitle>
     <Product>MaterialDesignColors.WpfExample</Product>
-    <Copyright>Copyright ©  2015</Copyright>
+    <Copyright>Copyright ©  2019</Copyright>
     <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
-    <Configurations>Debug;Release;AppVeyor</Configurations>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppVeyor|AnyCPU'">
-    <OutputPath>bin\AppVeyor\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
+    <Configurations>Debug;Release</Configurations>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup>
     <ApplicationIcon>favicon.ico</ApplicationIcon>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
   <Import Project="..\packages\ShowMeTheXAML.MSBuild\build\ShowMeTheXAML.MSBuild.targets" Label="Paket" />
   <Target Name="ShowMeTheXAML_EnsureXamlCreated" AfterTargets="BeforeCompile">
     <Error Condition="('$(ShowMeTheXAMLGeneratedFileName)' == '' Or $(ShowMeTheXAMLGeneratedFileName) == '*Undefined*') And Exists('..\packages\ShowMeTheXAML.MSBuild\build\ShowMeTheXAML.MSBuild.targets')" Text="ShowMeTheXAML was added to the $(ProjectName) project. Please rebuild the project." />
@@ -238,33 +229,14 @@
     <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\ProfilePic.jpg" />
+    <Resource Include="Resources\*.jpg" />
+    <Resource Include="Resources\*.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="ScreenGrabFromGoogle.gif" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Chartridge046_small.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ms-icon-310x310.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Contact.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="favicon.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="obj\AppVeyor\GeneratedInternalTypeHelper.g.cs" />
-    <Compile Remove="obj\AppVeyor\Lists.g.cs" />
-    <Compile Remove="obj\AppVeyor\Palette.g.cs" />
-    <Compile Remove="obj\AppVeyor\ShowMeTheXaml_XamlDictionary.g.cs" />
-    <Compile Remove="obj\AppVeyor\Sliders.g.cs" />
-    <Compile Remove="obj\AppVeyor\Transitions.g.cs" />
-    <Compile Remove="obj\AppVeyor\Typography.g.cs" />
-    <Compile Remove="obj\AppVeyor\Domain\SampleProgressDialog.g.cs" />
-    <Compile Remove="obj\AppVeyor\TransitionsDemo\Slide8_Details.g.cs" />
-  </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/MainDemo.Wpf/Pickers.xaml b/MainDemo.Wpf/Pickers.xaml
@@ -72,6 +72,12 @@
                                         Style="{StaticResource MaterialDesignFloatingHintTimePicker}"
                                         materialDesign:HintAssist.Hint="Disabled" />
                 </smtx:XamlDisplay>
+                <smtx:XamlDisplay Key="pickers_13" HorizontalAlignment="Left" Margin="0 32 0 0">
+                    <DatePicker Width="140" materialDesign:HintAssist.Hint="Pick Date" Style="{StaticResource MaterialDesignFilledDatePicker}" />
+                </smtx:XamlDisplay>
+                <smtx:XamlDisplay Key="pickers_14" HorizontalAlignment="Left" Margin="0 16 0 0">
+                    <DatePicker Width="140" materialDesign:HintAssist.Hint="Pick Date" Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
+                </smtx:XamlDisplay>
             </StackPanel>
 
             <smtx:XamlDisplay Key="pickers_7" Grid.Row="1" Grid.Column="2" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0 16 0 0">

diff --git a/MainDemo.Wpf/ProvingGround.xaml b/MainDemo.Wpf/ProvingGround.xaml
@@ -35,13 +35,6 @@
                 -->
 
             </ResourceDictionary.MergedDictionaries>
-
-
-
-
-
-
-
         </ResourceDictionary>
     </UserControl.Resources>
 

diff --git a/MainDemo.Wpf/Toggles.xaml b/MainDemo.Wpf/Toggles.xaml
@@ -18,6 +18,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
@@ -113,7 +114,27 @@
                 </CheckBox>
             </smtx:XamlDisplay>
         </StackPanel>
-        <StackPanel Grid.Column="0" Grid.Row="3" Margin="0 24 0 0" Orientation="Horizontal">
+        <StackPanel Grid.Column="0" Grid.Row="3" Margin="5 8 0 8" Orientation="Horizontal">
+            <smtx:XamlDisplay Key="buttons_65">
+                <RadioButton Style="{StaticResource MaterialDesignLightRadioButton}" IsChecked="True" Content="Light" />
+            </smtx:XamlDisplay>
+            <smtx:XamlDisplay Key="buttons_66" Margin="8 0 0 0">
+                <RadioButton Style="{StaticResource MaterialDesignDarkRadioButton}" IsChecked="True" Content="Dark" />
+            </smtx:XamlDisplay>
+            <smtx:XamlDisplay Key="buttons_67" Margin="8 0 0 0">
+                <RadioButton Style="{StaticResource MaterialDesignAccentRadioButton}" IsChecked="True" Content="Accent" />
+            </smtx:XamlDisplay>
+            <smtx:XamlDisplay Key="buttons_68" Margin="8 0 0 0">
+                <CheckBox IsChecked="True" Style="{StaticResource MaterialDesignLightCheckBox}" Content="Light" />
+            </smtx:XamlDisplay>
+            <smtx:XamlDisplay Key="buttons_69" Margin="8 0 0 0">
+                <CheckBox IsChecked="True" Style="{StaticResource MaterialDesignDarkCheckBox}" Content="Dark" />
+            </smtx:XamlDisplay>
+            <smtx:XamlDisplay Key="buttons_70" Margin="8 0 0 0">
+                <CheckBox IsChecked="True" Style="{StaticResource MaterialDesignAccentCheckBox}" Content="Accent" />
+            </smtx:XamlDisplay>
+        </StackPanel>
+        <StackPanel Grid.Column="0" Grid.Row="4" Margin="0 24 0 0" Orientation="Horizontal">
             <smtx:XamlDisplay Key="buttons_46" VerticalAlignment="Center" Margin="5 0 0 0">
                 <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" ToolTip="Default ToggleButton Style"/>
             </smtx:XamlDisplay>
@@ -160,7 +181,7 @@
                 </ToggleButton>
             </smtx:XamlDisplay>
         </StackPanel>
-        <StackPanel Grid.Column="0" Grid.Row="4" Margin="0 24 0 0" Orientation="Horizontal">
+        <StackPanel Grid.Column="0" Grid.Row="5" Margin="0 24 0 0" Orientation="Horizontal">
             <smtx:XamlDisplay Key="buttons_53" Margin="5 0 0 0" VerticalAlignment="Center">
                 <ToggleButton Style="{StaticResource MaterialDesignFlatToggleButton}" ToolTip="MaterialDesignFlatToggleButton">
                     <materialDesign:PackIcon Kind="Paperclip" Height="21" Width="21" />
@@ -205,7 +226,7 @@
                 </ListBoxItem>
             </ListBox>
         </smtx:XamlDisplay>
-        <smtx:XamlDisplay Key="buttons_57" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" Margin="0 24 0 0">
+        <smtx:XamlDisplay Key="buttons_57" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Left" Margin="0 24 0 0">
             <ListBox  SelectionMode="Extended" Style="{StaticResource MaterialDesignToolToggleFlatListBox}">
                 <ListBox.ToolTip>
                     <StackPanel>
@@ -225,7 +246,7 @@
                 </ListBoxItem>
             </ListBox>
         </smtx:XamlDisplay>
-        <StackPanel Grid.Column="1" Grid.Row="4" Margin="0 24 0 0">
+        <StackPanel Grid.Column="1" Grid.Row="5" Margin="0 24 0 0">
             <smtx:XamlDisplay Key="buttons_60" HorizontalAlignment="Left">
                 <StackPanel Orientation="Horizontal" Margin="4">
                     <RadioButton Style="{StaticResource MaterialDesignTabRadioButton}" Margin="4" IsChecked="True" Content="FIRST"/>
@@ -244,9 +265,9 @@
             </smtx:XamlDisplay>
 
         </StackPanel>
-        <Border Margin="0 24 0 0" BorderThickness="0 1 0 0" BorderBrush="{DynamicResource MaterialDesignDivider}" Grid.Row="5" Grid.ColumnSpan="2" />
-        <TextBlock Grid.Row="6" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="0 24">Checkboxes</TextBlock>
-        <smtx:XamlDisplay Key="fields_31" Grid.Row="7" HorizontalAlignment="Left">
+        <Border Margin="0 24 0 0" BorderThickness="0 1 0 0" BorderBrush="{DynamicResource MaterialDesignDivider}" Grid.Row="6" Grid.ColumnSpan="2" />
+        <TextBlock Grid.Row="7" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Margin="0 24">Checkboxes</TextBlock>
+        <smtx:XamlDisplay Key="fields_31" Grid.Row="8" HorizontalAlignment="Left">
             <StackPanel Margin="8 0">
                 <CheckBox IsChecked="True">Checked</CheckBox>
                 <CheckBox IsChecked="False">Unchecked</CheckBox>

diff --git a/MaterialDesignColors.Wpf/ColorManipulation/Hsv.cs b/MaterialDesignColors.Wpf/ColorManipulation/Hsv.cs
diff --git a/MaterialDesignColors.Wpf/ColorManipulation/HsvConverter.cs b/MaterialDesignColors.Wpf/ColorManipulation/HsvConverter.cs
diff --git a/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
@@ -11,25 +11,14 @@
     <Company>Mulholland Software/James Willock</Company>
     <Product>MaterialDesignColors.Wpf</Product>
     <Description>Material Design in XAML Toolkit - Colors</Description>
-    <Copyright>Copyright © 2015</Copyright>
+    <Copyright>Copyright © 2019</Copyright>
     <Version>1.0.1</Version>
     <AssemblyVersion>1.0.1</AssemblyVersion>
     <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
-    <Configurations>Debug;Release;AppVeyor</Configurations>
+    <Configurations>Debug;Release</Configurations>
     <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppVeyor|AnyCPU'">
-    <OutputPath>bin\AppVeyor\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <Import Project="..\Versioning.targets" />
-  <ItemGroup>
-    <Compile Remove="ColorManipulation\Hsv.cs" />
-    <Compile Remove="ColorManipulation\HsvConverter.cs" />
-  </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/MaterialDesignColors.nuspec b/MaterialDesignColors.nuspec
@@ -1,24 +1,26 @@
 <?xml version="1.0"?>
-<package >
+<package>
   <metadata>
     <id>MaterialDesignColors</id>
-    <version>1.1.4-beta</version>
+    <version>$version$</version>
     <title>Material Design Colors XAML Resources</title>
     <authors>James Willock</authors>
     <owners>James Willock</owners>
-    <licenseUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>    
+    <license type="expression">MIT</license>
+    <projectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</projectUrl>
     <iconUrl>http://materialdesigninxaml.net/images/MD4XAML32.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>ResourceDictionary instances containing standard Google Material Design swatches, for inclusion in a XAML application.</description>
     <releaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</releaseNotes>
-    <copyright>Copyright 2015 James Willock/Mulholland Software Ltd</copyright>
+    <copyright>$copyright$</copyright>
     <tags>WPF XAML Material Design Colour Color UI UX</tags>
+    <dependencies>
+      <group targetFramework=".NETFramework4.5" />
+      <group targetFramework=".NETCoreApp3.0" />
+    </dependencies>
   </metadata>
   <files>
-    <file src="MaterialDesignColors.Wpf\bin\AppVeyor\net45\MaterialDesignColors.dll" target="lib\net45" />
-    <file src="MaterialDesignColors.Wpf\bin\AppVeyor\net45\MaterialDesignColors.pdb" target="lib\net45" />
-    <file src="MaterialDesignColors.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignColors.dll" target="lib\netcoreapp3.0" />
-    <file src="MaterialDesignColors.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignColors.pdb" target="lib\netcoreapp3.0" />
+    <file src="MaterialDesignColors.Wpf\bin\$configuration$\net45\MaterialDesignColors.*" target="lib\net45" exclude="**\*.json" />
+    <file src="MaterialDesignColors.Wpf\bin\$configuration$\netcoreapp3.0\MaterialDesignColors.*" target="lib\netcoreapp3.0" exclude="**\*.json" />
   </files>
 </package>