Adding MahAppsCustomColorTheme and more naming conversion from Accent to Secondary

Author: Keboo

MahMaterialDragablzMashUp/App.xaml

@@ -8,7 +8,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <materialDesign:MahAppsBundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" AccentColor="Lime"/>
+                <materialDesign:MahAppsBundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime"/>
 
                 <!-- MahApps -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />

MainDemo.Wpf/App.xaml

@@ -17,10 +17,10 @@
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
 
                 <!-- However, however you can make it simpler by just using one of the built-in themes. This is functionally identical to what is above.-->
-                <!--<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" AccentColor="Lime" />-->
+                <!--<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />-->
 
                 <!-- If you would prefer to use your own colors there is an option for that as well -->
-                <!--<materialDesign:CustomColorTheme BaseTheme="Light" Primary="Aqua" Accent="DarkGreen" />-->
+                <!--<materialDesign:CustomColorTheme BaseTheme="Light" Primary="Aqua" Secondary="DarkGreen" />-->
 
                 <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
 

MaterialDesignColors.Wpf/MaterialDesignColor.cs

@@ -23,24 +23,24 @@ public enum PrimaryColor
         BlueGrey = MaterialDesignColor.BlueGrey500,
     }
 
-    public enum AccentColor
+    public enum SecondaryColor
     {
-        Red = MaterialDesignColor.RedA700,
-        Pink = MaterialDesignColor.PinkA700,
-        Purple = MaterialDesignColor.PurpleA700,
-        DeepPurple = MaterialDesignColor.DeepPurpleA700,
-        Indigo = MaterialDesignColor.IndigoA700,
-        Blue = MaterialDesignColor.BlueA700,
-        LightBlue = MaterialDesignColor.LightBlueA700,
-        Cyan = MaterialDesignColor.CyanA700,
-        Teal = MaterialDesignColor.TealA700,
-        Green = MaterialDesignColor.GreenA700,
-        LightGreen = MaterialDesignColor.LightGreenA700,
-        Lime = MaterialDesignColor.LimeA700,
-        Yellow = MaterialDesignColor.YellowA700,
-        Amber = MaterialDesignColor.AmberA700,
-        Orange = MaterialDesignColor.OrangeA700,
-        DeepOrange = MaterialDesignColor.DeepOrangeA700
+        Red = MaterialDesignColor.RedSecondary,
+        Pink = MaterialDesignColor.PinkSecondary,
+        Purple = MaterialDesignColor.PurpleSecondary,
+        DeepPurple = MaterialDesignColor.DeepPurpleSecondary,
+        Indigo = MaterialDesignColor.IndigoSecondary,
+        Blue = MaterialDesignColor.BlueSecondary,
+        LightBlue = MaterialDesignColor.LightBlueSecondary,
+        Cyan = MaterialDesignColor.CyanSecondary,
+        Teal = MaterialDesignColor.TealSecondary,
+        Green = MaterialDesignColor.GreenSecondary,
+        LightGreen = MaterialDesignColor.LightGreenSecondary,
+        Lime = MaterialDesignColor.LimeSecondary,
+        Yellow = MaterialDesignColor.YellowSecondary,
+        Amber = MaterialDesignColor.AmberSecondary,
+        Orange = MaterialDesignColor.OrangeSecondary,
+        DeepOrange = MaterialDesignColor.DeepOrangeSecondary
     }
 
     public enum MaterialDesignColor
@@ -320,21 +320,21 @@ public enum MaterialDesignColor
         Grey = Grey500,
         BlueGrey = BlueGrey500,
 
-        RedAccent = RedA700,
-        PinkAccent = PinkA700,
-        PurpleAccent = PurpleA700,
-        DeepPurpleAccent = DeepPurpleA700,
-        IndigoAccent = IndigoA700,
-        BlueAccent = BlueA700,
-        LightBlueAccent = LightBlueA700,
-        CyanAccent = CyanA700,
-        TealAccent = TealA700,
-        GreenAccent = GreenA700,
-        LightGreenAccent = LightGreenA700,
-        LimeAccent = LimeA700,
-        YellowAccent = YellowA700,
-        AmberAccent = AmberA700,
-        OrangeAccent = OrangeA700,
-        DeepOrangeAccent = DeepOrangeA700
+        RedSecondary = RedA700,
+        PinkSecondary = PinkA700,
+        PurpleSecondary = PurpleA700,
+        DeepPurpleSecondary = DeepPurpleA700,
+        IndigoSecondary = IndigoA700,
+        BlueSecondary = BlueA700,
+        LightBlueSecondary = LightBlueA700,
+        CyanSecondary = CyanA700,
+        TealSecondary = TealA700,
+        GreenSecondary = GreenA700,
+        LightGreenSecondary = LightGreenA700,
+        LimeSecondary = LimeA700,
+        YellowSecondary = YellowA700,
+        AmberSecondary = AmberA700,
+        OrangeSecondary = OrangeA700,
+        DeepOrangeSecondary = DeepOrangeA700
     }
 }

MaterialDesignThemes.MahApps/MahAppsCustomColorTheme.cs

@@ -0,0 +1,33 @@
+using System.Windows;
+using System.Windows.Media;
+using MaterialDesignColors.ColorManipulation;
+using MaterialDesignThemes.Wpf;
+
+namespace MaterialDesignThemes.MahApps
+{
+    public class MahAppsCustomColorTheme : CustomColorTheme
+    {
+        protected override void SetTheme(ITheme theme, ResourceDictionary resourceDictionary)
+        {
+            base.SetTheme(theme, resourceDictionary);
+            resourceDictionary.SetMahApps(theme, BaseTheme);
+            IThemeManager themeManager = resourceDictionary.GetThemeManager();
+            if (themeManager != null)
+            {
+                themeManager.ThemeChanged += ThemeManagerOnThemeChanged;
+            }
+        }
+
+        private void ThemeManagerOnThemeChanged(object sender, ThemeChangedEventArgs e)
+        {
+            ResourceDictionary resourceDictionary = e.ResourceDictionary;
+
+            ITheme newTheme = e.NewTheme;
+
+            var foreground = newTheme.Background.ContrastingForegroundColor();
+
+            BaseTheme baseTheme = foreground == Colors.Black ? BaseTheme.Light : BaseTheme.Dark;
+            resourceDictionary.SetMahApps(newTheme, baseTheme);
+        }
+    }
+}

MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj

@@ -80,6 +80,7 @@
   <ItemGroup>
     <Compile Include="FlyoutAssist.cs" />
     <Compile Include="MahAppsBundledTheme.cs" />
+    <Compile Include="MahAppsCustomColorTheme.cs" />
     <Compile Include="MaterialDesignAssist.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>

MaterialDesignThemes.Wpf/ThemeMarkupExtension.cs

@@ -29,25 +29,25 @@ public class BundledTheme : ThemeMarkupExtension
     {
         public BaseTheme BaseTheme { get; set; }
         public PrimaryColor PrimaryColor { get; set; }
-        public AccentColor AccentColor { get; set; }
+        public SecondaryColor SecondaryColor { get; set; }
 
         protected override ITheme GetTheme()
         {
             return Theme.Create(BaseTheme.GetBaseTheme(),
                 SwatchHelper.Lookup[(MaterialDesignColor) PrimaryColor],
-                SwatchHelper.Lookup[(MaterialDesignColor) AccentColor]);
+                SwatchHelper.Lookup[(MaterialDesignColor) SecondaryColor]);
         }
     }
 
     public class CustomColorTheme : ThemeMarkupExtension
     {
         public BaseTheme BaseTheme { get; set; }
         public Color Primary { get; set; }
-        public Color Accent { get; set; }
+        public Color Secondary { get; set; }
 
         protected override ITheme GetTheme()
         {
-            return Theme.Create(BaseTheme.GetBaseTheme(), Primary, Accent);
+            return Theme.Create(BaseTheme.GetBaseTheme(), Primary, Secondary);
         }
     }
 }