Update to support latest MahApps (#1845)

Keboo · Keboo · commit 48ef97ad8d0a · 2020-05-25T01:48:55.000-07:00
diff --git a/MaterialDesignThemes.MahApps/BaseThemeExtensions.cs b/MaterialDesignThemes.MahApps/BaseThemeExtensions.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using MahApps.Metro;
+using ControlzEx.Theming;
 using MaterialDesignThemes.Wpf;
 
 namespace MaterialDesignThemes.MahApps
@@ -10,8 +10,8 @@ public static string GetMahAppsBaseColorScheme(this BaseTheme baseTheme)
         {
             return baseTheme switch
             {
-                Wpf.BaseTheme.Light => ThemeManager.BaseColorLight,
-                Wpf.BaseTheme.Dark => ThemeManager.BaseColorDark,
+                BaseTheme.Light => ThemeManager.BaseColorLightConst,
+                BaseTheme.Dark => ThemeManager.BaseColorDarkConst,
                 _ => throw new InvalidOperationException()
             };
         }
diff --git a/MaterialDesignThemes.MahApps/MahAppsBundledTheme.cs b/MaterialDesignThemes.MahApps/MahAppsBundledTheme.cs
@@ -2,10 +2,11 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using MahApps.Metro;
+using ControlzEx.Theming;
 using MaterialDesignColors;
 using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
+using Theme = ControlzEx.Theming.Theme;
 
 namespace MaterialDesignThemes.MahApps
 {
@@ -57,9 +58,8 @@ static ResourceDictionary GetResourceDictionary(ITheme theme, PrimaryColor prima
             {
                 string baseColorScheme = baseTheme.GetMahAppsBaseColorScheme();
                 string colorScheme = $"MaterialDesign.{primaryColor}.{secondaryColor}";
-
                 ResourceDictionary rv;
-                if (ThemeManager.Themes.FirstOrDefault(x => x.BaseColorScheme == baseColorScheme && x.ColorScheme == primaryColor.ToString()) is global::MahApps.Metro.Theme mahAppsTheme)
+                if (ThemeManager.Current.Themes.FirstOrDefault(x => x.BaseColorScheme == baseColorScheme && x.ColorScheme == primaryColor.ToString()) is Theme mahAppsTheme)
                 {
                     rv = mahAppsTheme.Resources;
                     rv.SetMahApps(theme, baseTheme);
@@ -70,16 +70,21 @@ static ResourceDictionary GetResourceDictionary(ITheme theme, PrimaryColor prima
                 rv[GeneratedKey] = GeneratedKey;
                 rv.SetMahApps(theme, baseTheme);
 
-                rv["Theme.Name"] = $"MaterialDesign.{baseColorScheme}.{primaryColor}.{secondaryColor}";
-                rv["Theme.DisplayName"] = $"Material Design {primaryColor} with {secondaryColor}";
-                rv["Theme.ColorScheme"] = colorScheme;
-                ThemeManager.AddTheme(rv);
+                string themeName = $"MaterialDesign.{primaryColor}.{secondaryColor}.{baseColorScheme}";
+                string displayName = $"Material Design {primaryColor} with {secondaryColor}";
+                rv[Theme.ThemeNameKey] = themeName;
+                rv[Theme.ThemeDisplayNameKey] = displayName;
+                rv[Theme.ThemeColorSchemeKey] = colorScheme;
+                rv[Theme.ThemeBaseColorSchemeKey] = baseColorScheme;
+                var themeInstance = new Theme(new LibraryTheme(rv, null));
+                rv[Theme.ThemeInstanceKey] = themeInstance;
+                ThemeManager.Current.AddTheme(themeInstance);
 
                 return rv;
             }
         }
 
-        private void ThemeManagerOnThemeChanged(object sender, ThemeChangedEventArgs e)
+        private void ThemeManagerOnThemeChanged(object sender, Wpf.ThemeChangedEventArgs e)
         {
             ResourceDictionary resourceDictionary = e.ResourceDictionary;
 
diff --git a/MaterialDesignThemes.MahApps/MahAppsCustomColorTheme.cs b/MaterialDesignThemes.MahApps/MahAppsCustomColorTheme.cs
@@ -2,9 +2,10 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using MahApps.Metro;
+using ControlzEx.Theming;
 using MaterialDesignColors.ColorManipulation;
 using MaterialDesignThemes.Wpf;
+using Theme = ControlzEx.Theming.Theme;
 
 namespace MaterialDesignThemes.MahApps
 {
@@ -58,7 +59,7 @@ static ResourceDictionary GetResourceDictionary(ITheme theme, Color primaryColor
                 string colorScheme = $"MaterialDesign.{primaryColor}.{secondaryColor}";
 
                 ResourceDictionary rv;
-                if (ThemeManager.Themes.FirstOrDefault(x => x.BaseColorScheme == baseColorScheme && x.ColorScheme == colorScheme) is global::MahApps.Metro.Theme mahAppsTheme)
+                if (ThemeManager.Current.Themes.FirstOrDefault(x => x.BaseColorScheme == baseColorScheme && x.ColorScheme == colorScheme) is ControlzEx.Theming.Theme mahAppsTheme)
                 {
                     rv = mahAppsTheme.Resources;
                     rv.SetMahApps(theme, baseTheme);
@@ -69,16 +70,19 @@ static ResourceDictionary GetResourceDictionary(ITheme theme, Color primaryColor
                 rv[GeneratedKey] = GeneratedKey;
                 rv.SetMahApps(theme, baseTheme);
 
-                rv["Theme.Name"] = $"MaterialDesign.{baseColorScheme}.{primaryColor}.{secondaryColor}";
-                rv["Theme.DisplayName"] = $"Material Design {primaryColor} with {secondaryColor}";
-                rv["Theme.ColorScheme"] = colorScheme;
-                ThemeManager.AddTheme(rv);
+                rv[Theme.ThemeNameKey] = $"MaterialDesign.{primaryColor}.{secondaryColor}.{baseColorScheme}";
+                rv[Theme.ThemeDisplayNameKey] = $"Material Design {primaryColor} with {secondaryColor}";
+                rv[Theme.ThemeColorSchemeKey] = colorScheme;
+                rv[Theme.ThemeBaseColorSchemeKey] = baseColorScheme;
+                var themeInstance = new Theme(new LibraryTheme(rv, null));
+                rv[Theme.ThemeInstanceKey] = themeInstance;
+                ThemeManager.Current.AddTheme(themeInstance);
 
                 return rv;
             }
         }
 
-        private void ThemeManagerOnThemeChanged(object sender, ThemeChangedEventArgs e)
+        private void ThemeManagerOnThemeChanged(object sender, Wpf.ThemeChangedEventArgs e)
         {
             ResourceDictionary resourceDictionary = e.ResourceDictionary;
 
diff --git a/MaterialDesignThemes.MahApps/MaterialDesignAssist.cs b/MaterialDesignThemes.MahApps/MaterialDesignAssist.cs
@@ -2,8 +2,9 @@
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using MahApps.Metro;
+using ControlzEx.Theming;
 using MaterialDesignThemes.Wpf;
+using Theme = ControlzEx.Theming.Theme;
 
 namespace MaterialDesignThemes.MahApps
 {
@@ -13,7 +14,8 @@ public static void SetMahApps(this ResourceDictionary resourceDictionary, ITheme
         {
             resourceDictionary.SetMahAppsBaseTheme(baseTheme);
 
-            resourceDictionary.SetBrush("Theme.ShowcaseBrush", new SolidColorBrush(theme.SecondaryMid.Color));
+            resourceDictionary.SetBrush(Theme.ThemeShowcaseBrushKey, new SolidColorBrush(theme.SecondaryMid.Color));
+            resourceDictionary.SetColor(Theme.ThemePrimaryAccentColorKey, theme.SecondaryMid.Color);
 
             resourceDictionary.SetColor("MahApps.Colors.HighlightLight", theme.PrimaryLight.Color);
             resourceDictionary.SetColor("MahApps.Colors.Highlight", theme.PrimaryMid.Color);
@@ -501,7 +503,6 @@ private static void SetColor(this ResourceDictionary resourceDictionary, string
 
         internal static void SetMahAppsBaseTheme(this ResourceDictionary resourceDictionary, BaseTheme baseTheme)
         {
-            var foo = ThemeManager.Themes;
             switch (baseTheme)
             {
                 case BaseTheme.Light:
diff --git a/paket-files/paket.restore.cached b/paket-files/paket.restore.cached
@@ -1,4 +1,4 @@
 {
-  "packagesDownloadedHash": "251BAD3109F98A01F104C291E7B0F8D2E4C06ABDE946D3C2D0FFC57092C32E4A",
-  "projectsRestoredHash": "251BAD3109F98A01F104C291E7B0F8D2E4C06ABDE946D3C2D0FFC57092C32E4A"
+  "packagesDownloadedHash": "B37C5E56DA79890D1BF77D83B0007CB549D83507FE901C9E21AED64E511015F0",
+  "projectsRestoredHash": "B37C5E56DA79890D1BF77D83B0007CB549D83507FE901C9E21AED64E511015F0"
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,7 +1,7 @@
 source https://nuget.org/api/v2
 framework: net45, net452, net472, netcoreapp3.1
 
-nuget MahApps.Metro ~> 2.0.0-alpha0748
+nuget MahApps.Metro ~> 2.0.0-alpha0821
 nuget Dragablz ~> 0.0.3
 nuget NuGet.CommandLine
 nuget Shouldly ~> 3.0
diff --git a/paket.lock b/paket.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using MahApps.Metro;`
	`2`	`+using ControlzEx.Theming;`
`3`	`3`	`using MaterialDesignThemes.Wpf;`
`4`	`4`
`5`	`5`	`namespace MaterialDesignThemes.MahApps`
`@@ -10,8 +10,8 @@ public static string GetMahAppsBaseColorScheme(this BaseTheme baseTheme)`
`10`	`10`	`{`
`11`	`11`	`return baseTheme switch`
`12`	`12`	`{`
`13`		`- Wpf.BaseTheme.Light => ThemeManager.BaseColorLight,`
`14`		`- Wpf.BaseTheme.Dark => ThemeManager.BaseColorDark,`
	`13`	`+ BaseTheme.Light => ThemeManager.BaseColorLightConst,`
	`14`	`+ BaseTheme.Dark => ThemeManager.BaseColorDarkConst,`
`15`	`15`	`_ => throw new InvalidOperationException()`
`16`	`16`	`};`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`	`using System.Windows;`
`3`	`3`	`using System.Windows.Media;`
`4`	`4`	`using System.Windows.Media.Animation;`
`5`		`-using MahApps.Metro;`
	`5`	`+using ControlzEx.Theming;`
`6`	`6`	`using MaterialDesignThemes.Wpf;`
	`7`	`+using Theme = ControlzEx.Theming.Theme;`
`7`	`8`
`8`	`9`	`namespace MaterialDesignThemes.MahApps`
`9`	`10`	`{`
`@@ -13,7 +14,8 @@ public static void SetMahApps(this ResourceDictionary resourceDictionary, ITheme`
`13`	`14`	`{`
`14`	`15`	`resourceDictionary.SetMahAppsBaseTheme(baseTheme);`
`15`	`16`
`16`		`- resourceDictionary.SetBrush("Theme.ShowcaseBrush", new SolidColorBrush(theme.SecondaryMid.Color));`
	`17`	`+ resourceDictionary.SetBrush(Theme.ThemeShowcaseBrushKey, new SolidColorBrush(theme.SecondaryMid.Color));`
	`18`	`+ resourceDictionary.SetColor(Theme.ThemePrimaryAccentColorKey, theme.SecondaryMid.Color);`
`17`	`19`
`18`	`20`	`resourceDictionary.SetColor("MahApps.Colors.HighlightLight", theme.PrimaryLight.Color);`
`19`	`21`	`resourceDictionary.SetColor("MahApps.Colors.Highlight", theme.PrimaryMid.Color);`
`@@ -501,7 +503,6 @@ private static void SetColor(this ResourceDictionary resourceDictionary, string`
`501`	`503`
`502`	`504`	`internal static void SetMahAppsBaseTheme(this ResourceDictionary resourceDictionary, BaseTheme baseTheme)`
`503`	`505`	`{`
`504`		`- var foo = ThemeManager.Themes;`
`505`	`506`	`switch (baseTheme)`
`506`	`507`	`{`
`507`	`508`	`case BaseTheme.Light:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "packagesDownloadedHash": "251BAD3109F98A01F104C291E7B0F8D2E4C06ABDE946D3C2D0FFC57092C32E4A",`
`3`		`- "projectsRestoredHash": "251BAD3109F98A01F104C291E7B0F8D2E4C06ABDE946D3C2D0FFC57092C32E4A"`
	`2`	`+ "packagesDownloadedHash": "B37C5E56DA79890D1BF77D83B0007CB549D83507FE901C9E21AED64E511015F0",`
	`3`	`+ "projectsRestoredHash": "B37C5E56DA79890D1BF77D83B0007CB549D83507FE901C9E21AED64E511015F0"`
`4`	`4`	`}`