Cleaning up color zone code (#2059)

Added UI tests for triggers

Author: Keboo

MaterialDesignThemes.UITests/WPF/ColorZone/ColorZoneTests.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using MaterialDesignThemes.Wpf;
+using XamlTest;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace MaterialDesignThemes.UITests.WPF.ColorZone
+{
+    public class ColorZoneTests : TestBase
+    {
+        public ColorZoneTests(ITestOutputHelper output)
+            : base(output)
+        {
+
+        }
+
+        [Theory]
+        [InlineData(ColorZoneMode.Standard, "MaterialDesignPaper", "MaterialDesignBody")]
+        [InlineData(ColorZoneMode.Inverted, "MaterialDesignBody", "MaterialDesignPaper")]
+        [InlineData(ColorZoneMode.PrimaryLight, "PrimaryHueLightBrush", "PrimaryHueLightForegroundBrush")]
+        [InlineData(ColorZoneMode.PrimaryMid, "PrimaryHueMidBrush", "PrimaryHueMidForegroundBrush")]
+        [InlineData(ColorZoneMode.PrimaryDark, "PrimaryHueDarkBrush", "PrimaryHueDarkForegroundBrush")]
+        [InlineData(ColorZoneMode.Accent, "SecondaryHueMidBrush", "SecondaryHueMidForegroundBrush")]
+        [InlineData(ColorZoneMode.Light, "MaterialDesignLightBackground", "MaterialDesignLightForeground")]
+        [InlineData(ColorZoneMode.Dark, "MaterialDesignDarkBackground", "MaterialDesignDarkForeground")]
+        public async Task Mode_SetsThemeColors(ColorZoneMode mode, string backgroundBrush, string foregroundBrush)
+        {
+            await using var recorder = new TestRecorder(App);
+
+            IVisualElement colorZone = await LoadXaml(@$"
+<materialDesign:ColorZone Mode=""{mode}""/>
+");
+            Color background = await GetThemeColor(backgroundBrush);
+            Color foreground = await GetThemeColor(foregroundBrush);
+
+            Assert.Equal(background, await colorZone.GetBackgroundColor());
+            Assert.Equal(foreground, await colorZone.GetForegroundColor());
+
+            recorder.Success();
+        }
+    }
+}

MaterialDesignThemes.Wpf/ColorZone.cs

@@ -1,21 +1,8 @@
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
 
 namespace MaterialDesignThemes.Wpf
 {
-    public enum ColorZoneMode
-    {
-        Standard,
-        Inverted,
-        PrimaryLight,
-        PrimaryMid,
-        PrimaryDark,
-        Accent,
-        Light,
-        Dark,
-        Custom
-    }
 
     /// <summary>
     /// User a colour zone to easily switch the background and foreground colours, from selected Material Design palette or custom ones.
@@ -32,17 +19,17 @@ static ColorZone()
 
         public ColorZoneMode Mode
         {
-            get { return (ColorZoneMode)GetValue(ModeProperty); }
-            set { SetValue(ModeProperty, value); }
+            get => (ColorZoneMode)GetValue(ModeProperty);
+            set => SetValue(ModeProperty, value);
         }
 
         public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
             nameof(CornerRadius), typeof(CornerRadius), typeof(ColorZone), new PropertyMetadata(default(CornerRadius)));
 
         public CornerRadius CornerRadius
         {
-            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
-            set { SetValue(CornerRadiusProperty, value); }
+            get => (CornerRadius)GetValue(CornerRadiusProperty);
+            set => SetValue(CornerRadiusProperty, value);
         }
     }
 }

MaterialDesignThemes.Wpf/ColorZoneMode.cs

@@ -0,0 +1,15 @@
+namespace MaterialDesignThemes.Wpf
+{
+    public enum ColorZoneMode
+    {
+        Standard,
+        Inverted,
+        PrimaryLight,
+        PrimaryMid,
+        PrimaryDark,
+        Accent,
+        Light,
+        Dark,
+        Custom
+    }
+}