Merge branch 'develop'

.github/FUNDING.yml

@@ -1,3 +1,3 @@
 # These are supported funding model platforms
 
-github: [punker76] # [punker76, batzen, ButchersBoy] Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [punker76, batzen] # [punker76, batzen, ButchersBoy] Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]

.gitignore

@@ -261,3 +261,9 @@ tools/
 
 # XamlStyler
 !XamlStyler/
+
+# Generated themes
+src/ControlzEx.Showcase/Themes/Themes/*.xaml
+!src/ControlzEx.Showcase/Themes/Themes/Theme.Template.xaml
+src/ControlzEx.Tests/Themes/Themes/*.xaml
+!src/ControlzEx.Tests/Themes/Themes/Theme.Template.xaml

GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: Major
 assembly-file-versioning-scheme: MajorMinorPatchTag
-next-version: 4.2.0
+next-version: 4.3.0
 mode: ContinuousDeployment
 branches:
   master:

NuGet.Config

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>  
+  <packageRestore>
+    <add key="enabled" value="True" />
+    <add key="automatic" value="True" />
+  </packageRestore>
+  <packageSources>
+    <clear />
+    <add key="CI.XamlColorSchemeGenerator" value="https://ci.appveyor.com/nuget/xamlcolorschemegenerator" />
+    <!-- <add key="XamlColorSchemeGenerator" value="C:\DEV\OSS_Own\XamlColorSchemeGenerator\bin\Release" /> -->
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+  <activePackageSource>
+    <clear />
+    <add key="CI.XamlColorSchemeGenerator" value="https://ci.appveyor.com/nuget/xamlcolorschemegenerator" />
+    <!-- <add key="XamlColorSchemeGenerator" value="C:\DEV\OSS_Own\XamlColorSchemeGenerator\bin\Release" /> -->
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </activePackageSource>
+</configuration>

README.md

@@ -224,7 +224,7 @@ public class PackIcon : PackIconBase<PackIconKind>
         return new Dictionary<PackIconKind, string>
         {
             {PackIconKind.Happy, "M20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M10,9.5C10,10.3 9.3,11 8.5,11C7.7,11 7,10.3 7,9.5C7,8.7 7.7,8 8.5,8C9.3,8 10,8.7 10,9.5M17,9.5C17,10.3 16.3,11 15.5,11C14.7,11 14,10.3 14,9.5C14,8.7 14.7,8 15.5,8C16.3,8 17,8.7 17,9.5M12,17.23C10.25,17.23 8.71,16.5 7.81,15.42L9.23,14C9.68,14.72 10.75,15.23 12,15.23C13.25,15.23 14.32,14.72 14.77,14L16.19,15.42C15.29,16.5 13.75,17.23 12,17.23Z"},
-            {PackIconKind.Sad, "M20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M15.5,8C16.3,8 17,8.7 17,9.5C17,10.3 16.3,11 15.5,11C14.7,11 14,10.3 14,9.5C14,8.7 14.7,8 15.5,8M10,9.5C10,10.3 9.3,11 8.5,11C7.7,11 7,10.3 7,9.5C7,8.7 7.7,8 8.5,8C9.3,8 10,8.7 10,9.5M12,14C13.75,14 15.29,14.72 16.19,15.81L14.77,17.23C14.32,16.5 13.25,16 12,16C10.75,16 9.68,16.5 9.23,17.23L7.81,15.81C8.71,14.72 10.25,14 12,14Z""}
+            {PackIconKind.Sad, "M20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12M22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2A10,10 0 0,1 22,12M15.5,8C16.3,8 17,8.7 17,9.5C17,10.3 16.3,11 15.5,11C14.7,11 14,10.3 14,9.5C14,8.7 14.7,8 15.5,8M10,9.5C10,10.3 9.3,11 8.5,11C7.7,11 7,10.3 7,9.5C7,8.7 7.7,8 8.5,8C9.3,8 10,8.7 10,9.5M12,14C13.75,14 15.29,14.72 16.19,15.81L14.77,17.23C14.32,16.5 13.25,16 12,16C10.75,16 9.68,16.5 9.23,17.23L7.81,15.81C8.71,14.72 10.25,14 12,14Z"}
         };
     }
 }
@@ -282,4 +282,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

appveyor.yml

@@ -6,6 +6,7 @@ branches:
   only:
     - develop
     - master
+    - /\d*\.\d*\.\d*/
 
 environment:
   azure-key-vault-url:

build.cake

@@ -51,6 +51,7 @@ if (FileExists(msBuildPathExe) == false)
 // Directories and Paths
 var solution = "src/ControlzEx.sln";
 var publishDir = "./src/bin";
+var testResultsDir = Directory("./TestResults");
 
 ///////////////////////////////////////////////////////////////////////////////
 // SETUP / TEARDOWN
@@ -106,7 +107,7 @@ Task("Build")
         Verbosity = verbosity
         , ToolPath = msBuildPathExe
         , Configuration = configuration
-        , ArgumentCustomization = args => args.Append("/m").Append("/nr:false") // The /nr switch tells msbuild to quite once it’s done
+        , ArgumentCustomization = args => args.Append("/m").Append("/nr:false") // The /nr switch tells msbuild to quit once it's done
     };
     MSBuild(solution, msBuildSettings
             .SetMaxCpuCount(0)
@@ -118,6 +119,7 @@ Task("Build")
 });
 
 Task("Pack")
+    .IsDependentOn("Build")
     .Does(() =>
 {
     var msBuildSettings = new MSBuildSettings {
@@ -292,6 +294,24 @@ Task("SignNuGet")
     }
 });
 
+Task("Test")    
+    .Does(() =>
+{
+    CleanDirectory(testResultsDir);
+
+    var settings = new DotNetCoreTestSettings
+        {
+            Configuration = configuration,
+            NoBuild = true,
+            NoRestore = true,
+            Logger = "trx",
+            ResultsDirectory = testResultsDir,
+            Verbosity = DotNetCoreVerbosity.Normal
+        };
+
+    DotNetCoreTest("./src/ControlzEx.sln", settings);
+});
+
 Task("Zip")
     .Does(() =>
 {

src/ControlzEx.Showcase/App.xaml

@@ -2,9 +2,13 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:ControlzEx.Showcase"
+             xmlns:theming="clr-namespace:ControlzEx.Showcase.Theming"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
+            <theming:ShowcaseLibraryThemeProvider x:Key="{x:Static theming:ShowcaseLibraryThemeProvider.DefaultInstance}" />
+            <theming:SecondShowcaseLibraryThemeProvider x:Key="{x:Static theming:SecondShowcaseLibraryThemeProvider.DefaultInstance}" />
+
             <Style x:Key="{x:Type local:WindowChromeWindow}" TargetType="{x:Type local:WindowChromeWindow}">
                 <Setter Property="BorderThickness" Value="1" />
                 <Setter Property="NCActiveBrush" Value="{Binding Background, RelativeSource={RelativeSource Self}}" />

src/ControlzEx.Showcase/App.xaml.cs

@@ -1,11 +1,17 @@
-using System.Windows;
-
 namespace ControlzEx.Showcase
 {
-    public partial class App : Application
+    using System.Windows;
+    using ControlzEx.Theming;
+
+    public partial class App
     {
-        public App()
+        protected override void OnStartup(StartupEventArgs e)
         {
+            base.OnStartup(e);
+
+            ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncAll;
+
+            ThemeManager.Current.SyncThemeColorSchemeWithWindowsAccentColor();
         }
     }
 }

src/ControlzEx.Showcase/ControlzEx.Showcase.csproj

@@ -5,13 +5,24 @@
         <AssemblyName>ControlzEx.Showcase</AssemblyName>
         <RootNamespace>ControlzEx.Showcase</RootNamespace>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <IsPackable>false</IsPackable>
+        <ApplicationIcon>..\..\logo.ico</ApplicationIcon>
     </PropertyGroup>
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <NoWarn>SA1652</NoWarn>
+        <NoWarn>SA1652;WPF0041</NoWarn>
         <ApplicationManifest>app.manifest</ApplicationManifest>
     </PropertyGroup>
+    <PropertyGroup>
+      <DefaultItemExcludes>$(DefaultItemExcludes);**/*.Template.xaml</DefaultItemExcludes>
+    </PropertyGroup>
     <!-- Items include -->
+    <ItemGroup>
+      <EmbeddedResource Include="**/*.Template.xaml" />
+      <EmbeddedResource Include="**/GeneratorParameters.json" />
+      <UpToDateCheckInput Include="**/*.xaml" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\ControlzEx\ControlzEx.csproj" />
     </ItemGroup>
@@ -22,4 +33,14 @@
         <Compile DependentUpon="%(Filename)" SubType="Code" Update="**\obj\**\*.g$(DefaultLanguageSourceExtension)" />
         <Compile DependentUpon="%(Filename)" SubType="Designer" Update="**\*.xaml$(DefaultLanguageSourceExtension)" />
     </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="XamlColorSchemeGenerator" version="4-*" privateAssets="All" includeAssets="build" />
+    </ItemGroup>
+
+    <Target Name="GenerateXamlFiles" BeforeTargets="DispatchToInnerBuilds">
+      <!-- Generate theme files -->
+      <Message Text="$(XamlColorSchemeGeneratorExecutable)" />
+      <Exec Command="&quot;$(XamlColorSchemeGeneratorExecutable)&quot;" WorkingDirectory="$(MSBuildProjectDirectory)/Themes/Themes" />
+    </Target>
 </Project>

src/ControlzEx.Showcase/MainWindow.xaml

@@ -7,6 +7,7 @@
                           xmlns:local="clr-namespace:ControlzEx.Showcase"
                           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                           xmlns:system="clr-namespace:System;assembly=mscorlib"
+                          xmlns:views="clr-namespace:ControlzEx.Showcase.Views"
                           x:Name="Window"
                           Title="ControlzEx.Showcase"
                           Width="800"
@@ -46,21 +47,30 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="150" />
+                    <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <Border Grid.ColumnSpan="2" Background="{Binding ElementName=Window, Path=NCCurrentBrush}" />
+                <Border Grid.ColumnSpan="10" Background="{Binding ElementName=Window, Path=NCCurrentBrush}" />
 
                 <TextBlock x:Name="TitlebarText"
                            Grid.Column="0"
                            Margin="4 0 0 0"
                            HorizontalAlignment="Center"
                            Text="Use GridSplitter below to move content above titlebar" />
+
+                <UniformGrid Grid.Column="2" Columns="3">
+                    <Button Width="20"
+                            Click="MinimizeButton_Click"
+                            Content="_" />
+                    <Button Click="RestoreOrMaximizeButton_Click" Content="[ ]" />
+                    <Button Click="CloseButton_Click" Content="X" />
+                </UniformGrid>
             </Grid>
 
             <GridSplitter Grid.Row="1"
                           Height="8"
                           HorizontalAlignment="Stretch"
                           controlzEx:WindowChrome.IsHitTestVisibleInChrome="True"
-                          Background="Green" />
+                          Background="{DynamicResource ControlzEx.Brushes.AccentBaseColorBrush}" />
 
             <controlzEx:TabControlEx Grid.Row="2">
                 <TabItem Header="WindowChrome">
@@ -178,6 +188,7 @@
                                 <WrapPanel Orientation="Horizontal">
                                     <Button MinWidth="100"
                                             Margin="4"
+                                            Padding="4"
                                             Content="ToolTipAssist">
                                         <Button.ToolTip>
                                             <ToolTip controlzEx:ToolTipAssist.AutoMove="True">
@@ -208,6 +219,17 @@
                                             </ToolTip>
                                         </Button.ToolTip>
                                     </Button>
+                                    <controlzEx:BadgedEx x:Name="BadgedButton"
+                                                         Badge="{x:Static system:DateTime.Now}"
+                                                         BadgeBackground="DodgerBlue"
+                                                         BadgeForeground="White"
+                                                         BadgeStringFormat="{}{0:ss}">
+                                        <Button MinWidth="100"
+                                                Margin="4"
+                                                Padding="4"
+                                                Click="BadgedButtonOnClick"
+                                                Content="Badge" />
+                                    </controlzEx:BadgedEx>
                                 </WrapPanel>
                             </GroupBox>
 
@@ -540,6 +562,10 @@
 
                     </Grid>
                 </TabItem>
+
+                <TabItem Header="Theming">
+                    <views:ThemingView />
+                </TabItem>
             </controlzEx:TabControlEx>
         </Grid>
     </Grid>