Adding support for ColorReferences in themes (#3395)

Bumped demos to net8

Author: Keboo

Directory.Build.props

@@ -3,7 +3,7 @@
     <Copyright>Copyright © 2022</Copyright>
     <Company>Mulholland Software/James Willock</Company>
 
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <ErrorReport>prompt</ErrorReport>
 
     <SignAssembly>true</SignAssembly>

MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

MainDemo.Wpf/MaterialDesignDemo.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Prefer32Bit Condition="'$(TargetFramework)' == 'net472'">true</Prefer32Bit>
     <ApplicationIcon>favicon.ico</ApplicationIcon>

MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Prefer32Bit Condition="'$(TargetFramework)' == 'net472'">true</Prefer32Bit>
     <ApplicationIcon>favicon.ico</ApplicationIcon>

MaterialDesignColors.Wpf/ColorPair.cs

@@ -5,29 +5,17 @@
 namespace MaterialDesignColors;
 
 [DebuggerDisplay($"Color: {{{nameof(Color)}}}; Foreground: {{{nameof(ForegroundColor)}}}")]
-public struct ColorPair
+public readonly struct ColorPair(Color color, Color? foregroundColor)
 {
-    public Color Color { get; set; }
+    public static implicit operator ColorPair(Color color) => new(color, null);
 
-    /// <summary>
-    /// The foreground or opposite color. If left null, this will be calculated for you.
-    /// Calculated by calling ColorAssist.ContrastingForegroundColor()
-    /// </summary>
-    public Color? ForegroundColor { get; set; }
+    public Color Color => color;
 
-    public static implicit operator ColorPair(Color color) => new ColorPair(color);
+    public Color? ForegroundColor => foregroundColor;
 
     public ColorPair(Color color)
-    {
-        Color = color;
-        ForegroundColor = null;
-    }
-
-    public ColorPair(Color color, Color? foreground)
-    {
-        Color = color;
-        ForegroundColor = foreground;
-    }
+        : this(color, null)
+    { }
 
     public Color GetForegroundColor() => ForegroundColor ?? Color.ContrastingForegroundColor();
 }

MaterialDesignThemes.MahApps/MahAppsCustomColorTheme.cs

@@ -87,7 +87,7 @@ private void ThemeManagerOnThemeChanged(object? sender, Wpf.ThemeChangedEventArg
 
         Theme newTheme = e.NewTheme;
 
-        BaseTheme baseTheme = newTheme.Background.IsLightColor()
+        BaseTheme baseTheme = ((Color)newTheme.Background).IsLightColor()
             ? Wpf.BaseTheme.Light
             : Wpf.BaseTheme.Dark;
 

MaterialDesignThemes.Wpf.Tests/ThemeTests.cs

@@ -0,0 +1,33 @@
+using System.Windows.Media;
+
+namespace MaterialDesignThemes.Wpf.Tests;
+
+public class ThemeTests
+{
+    [Fact]
+    public void CanSetForegroundWithColor()
+    {
+        var theme = Theme.Create(BaseTheme.Dark, Colors.Red, Colors.Blue);
+        theme.Foreground = Colors.Green;
+
+        Assert.Equal<Color>(Colors.Green, theme.Foreground);
+    }
+
+    [Fact]
+    public void CanSetForegroundWithThemeColorReference()
+    {
+        var theme = Theme.Create(BaseTheme.Dark, Colors.Red, Colors.Blue);
+        theme.Foreground = ThemeColorReference.PrimaryMid;
+
+        Assert.Equal<Color>(Colors.Red, theme.Foreground);
+    }
+
+    [Fact]
+    public void CanSetForegroundWithColorReference()
+    {
+        var theme = Theme.Create(BaseTheme.Dark, Colors.Red, Colors.Blue);
+        theme.Foreground = ColorReference.PrimaryMid;
+
+        Assert.Equal<Color>(Colors.Red, theme.Foreground);
+    }
+}

MaterialDesignThemes.Wpf/ColorReference.cs

@@ -0,0 +1,18 @@
+using System.Windows.Media;
+
+namespace MaterialDesignThemes.Wpf;
+
+public readonly record struct ColorReference(ThemeColorReference ThemeReference, Color? Color)
+{
+    public static ColorReference SecondaryLight { get; } = new ColorReference(ThemeColorReference.SecondaryLight, null);
+    public static ColorReference SecondaryMid { get; } = new ColorReference(ThemeColorReference.SecondaryMid, null);
+    public static ColorReference SecondaryDark { get; } = new ColorReference(ThemeColorReference.SecondaryDark, null);
+    public static ColorReference PrimaryLight { get; } = new ColorReference(ThemeColorReference.PrimaryLight, null);
+    public static ColorReference PrimaryMid { get; } = new ColorReference(ThemeColorReference.PrimaryMid, null);
+    public static ColorReference PrimaryDark { get; } = new ColorReference(ThemeColorReference.PrimaryDark, null);
+
+    public static implicit operator ColorReference(Color color) => new(ThemeColorReference.None, color);
+    public static implicit operator ColorReference(ThemeColorReference @ref) => new(@ref, null);
+    public static implicit operator Color(ColorReference color) => color.Color ??
+        throw new InvalidOperationException($"{nameof(ColorReference)} does not contain any color");
+}

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

@@ -25,6 +25,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Shims\IsExternalInit.cs" Link="IsExternalInit.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
   </ItemGroup>

MaterialDesignThemes.Wpf/ResourceDictionaryExtensions.cs

@@ -1,5 +1,4 @@
-using System.Runtime.CompilerServices;
-using System.Windows.Media;
+using System.Windows.Media;
 using System.Windows.Media.Animation;
 using MaterialDesignColors;
 using MaterialDesignColors.ColorManipulation;
@@ -220,12 +219,9 @@ private static void AdjustColors(Color background, ColorAdjustment colorAdjustme
         }
     }
 
-    private class ThemeManager : IThemeManager
+    private class ThemeManager(ResourceDictionary resourceDictionary) : IThemeManager
     {
-        private readonly ResourceDictionary _resourceDictionary;
-
-        public ThemeManager(ResourceDictionary resourceDictionary)
-            => _resourceDictionary = resourceDictionary ?? throw new ArgumentNullException(nameof(resourceDictionary));
+        private readonly ResourceDictionary _resourceDictionary = resourceDictionary ?? throw new ArgumentNullException(nameof(resourceDictionary));
 
         public event EventHandler<ThemeChangedEventArgs>? ThemeChanged;