[WinUI] Made branding colors overridable (#19)

* Made WinUI branding colors overridable by removing manual ResourceDictionary references in files

* Updated ResourceGenerator to remove an offending ResourceDictionary reference in the future

Author: imalcolm1

GeneratedResources/WinUI/Colors/Brushes.xaml

@@ -1,8 +1,5 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Esri.Calcite.WinUI/Colors/Colors.xaml" />
-    </ResourceDictionary.MergedDictionaries>
             <SolidColorBrush x:Key="CalciteBackgroundBrush" Color="{ThemeResource CalciteBackgroundColor}" />
             <SolidColorBrush x:Key="CalciteBackgroundNoneBrush" Color="{ThemeResource CalciteBackgroundNoneColor}" />
             <SolidColorBrush x:Key="CalciteBorder1Brush" Color="{ThemeResource CalciteBorder1Color}" />

Tools/ResourceGenerator/Program.cs

@@ -134,12 +134,15 @@ void GenerateColors(string pathToDesignTokensRepo, string pathToOutput, string f
     // Brushes
     using var brushOutput = new StreamWriter(Path.Combine(pathToOutput, "Brushes.xaml"));
     brushOutput.WriteLine(xamlHeader);
-    brushOutput.WriteLine("    <ResourceDictionary.MergedDictionaries>");
-    if (format == "WinUI" || format == "UWP")
-        brushOutput.WriteLine($"        <ResourceDictionary Source=\"ms-appx:///Esri.Calcite.{format}/Colors/Colors.xaml\" />");
-    else if (format == "Maui")
-        brushOutput.WriteLine($"        <ResourceDictionary Source=\"Colors.xaml\" />");
-    brushOutput.WriteLine("    </ResourceDictionary.MergedDictionaries>");
+    if (format != "WinUI")
+    {
+        brushOutput.WriteLine("    <ResourceDictionary.MergedDictionaries>");
+        if (format == "UWP")
+            brushOutput.WriteLine($"        <ResourceDictionary Source=\"ms-appx:///Esri.Calcite.{format}/Colors/Colors.xaml\" />");
+        else if (format == "Maui")
+            brushOutput.WriteLine($"        <ResourceDictionary Source=\"Colors.xaml\" />");
+        brushOutput.WriteLine("    </ResourceDictionary.MergedDictionaries>");
+    }
     foreach (var dark in darkColors)
     {
         var name = dark.Key;

src/Esri.Calcite.WinUI/Styles/Brushes.xaml

@@ -1,8 +1,4 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Esri.Calcite.WinUI/Colors/Brushes.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key ="Default" >
             <Color x:Key="CalciteTextOnBrandColor">White</Color>

src/Esri.Calcite.WinUI/Styles/Controls/Buttons.xaml

@@ -3,10 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cal="using:Esri.Calcite.WinUI"
     >
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Esri.Calcite.WinUI/Styles/Fonts.xaml" />
-        <ResourceDictionary Source="ms-appx:///Esri.Calcite.WinUI/Styles/Brushes.xaml" />
-    </ResourceDictionary.MergedDictionaries>
 
     <StaticResource x:Key="ButtonBackground" ResourceKey="CalciteBackground3Brush" />
     <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="CalciteBackground2Brush" />

src/Esri.Calcite.WinUI/Styles/Controls/TextBox.xaml

@@ -1,10 +1,6 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Esri.Calcite.WinUI/Styles/Fonts.xaml" />
-        <ResourceDictionary Source="ms-appx:///Esri.Calcite.WinUI/Colors/Brushes.xaml" />
-    </ResourceDictionary.MergedDictionaries>
 
     <StaticResource x:Key="TextControlBorderBrush" ResourceKey="CalciteBorder2Brush" />
     <StaticResource x:Key="TextControlBackground" ResourceKey="CalciteBackground1Brush" />

src/TestApps/WinUITests/App.xaml

@@ -15,6 +15,23 @@
                         <CalciteResources xmlns="using:Esri.Calcite.WinUI" />
                     </XamlControlsResources.MergedDictionaries>
                 </XamlControlsResources>
+                
+                <!-- Merge in XAML resource overrides -->
+                <ResourceDictionary>
+                    <!-- Override brand colors -->
+                    <!--<ResourceDictionary.ThemeDictionaries>
+                        <ResourceDictionary x:Key="Default">
+                            <Color x:Key="CalciteBrandColor" >#8F53CA</Color>
+                            <Color x:Key="CalciteBrandHoverColor" >#7938B6</Color>
+                            <Color x:Key="CalciteBrandPressColor" >#652E98</Color>
+                        </ResourceDictionary>
+                        <ResourceDictionary x:Key="Dark">
+                            <Color x:Key="CalciteBrandColor" >#7938B6</Color>
+                            <Color x:Key="CalciteBrandHoverColor" >#652E98</Color>
+                            <Color x:Key="CalciteBrandPressColor" >#51247A</Color>
+                        </ResourceDictionary>
+                    </ResourceDictionary.ThemeDictionaries>-->
+                </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             <!-- Other app resources here -->
             <Style TargetType="TextBlock" x:Key="CodeTextBlock">