Adding per heading foreground

Author: niels9001

components/MarkdownTextBlock/samples/MarkdownTextBlockExampleSample.xaml.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.WinUI.Controls;
+using Microsoft.UI;
 using System.Diagnostics;
 
 namespace MarkdownTextBlockExperiment.Samples;
@@ -600,7 +601,12 @@ public string Text
     public MarkdownTextBlockExampleSample()
     {
         this.InitializeComponent();
-        _config = new MarkdownConfig();
+
+        var themes = new MarkdownThemes
+        {
+
+        };
+        _config = new MarkdownConfig { Themes = themes };
         _text = _markdown;
         MarkdownTextBlock.OnLinkClicked += MarkdownTextBlock_OnLinkClicked;
     }

components/MarkdownTextBlock/src/MarkdownThemes.cs

@@ -34,9 +34,14 @@ public sealed class MarkdownThemes : DependencyObject
 
     public double H6FontSize { get; set; } = 12;
 
-    public Brush HeadingForeground { get; set; } = Extensions.GetAccentColorBrush();
+    public Brush H1Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
+    public Brush H2Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
+    public Brush H3Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
+    public Brush H4Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
+    public Brush H5Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
+    public Brush H6Foreground { get; set; } = (Brush)Application.Current.Resources["TextFillColorPrimaryBrush"];
 
-    public FontWeight H1FontWeight { get; set; } = FontWeights.Bold;
+    public FontWeight H1FontWeight { get; set; } = FontWeights.SemiBold;
 
     public FontWeight H2FontWeight { get; set; } = FontWeights.Normal;
 
@@ -48,10 +53,10 @@ public sealed class MarkdownThemes : DependencyObject
 
     public FontWeight H6FontWeight { get; set; } = FontWeights.Normal;
 
-    public Thickness H1Margin { get; set; } = new(left: 0, top: 14, right: 0, bottom: 0);
-    public Thickness H2Margin { get; set; } = new(left: 0, top: 14, right: 0, bottom: 0);
-    public Thickness H3Margin { get; set; } = new(left: 0, top: 14, right: 0, bottom: 0);
-    public Thickness H4Margin { get; set; } = new(left: 0, top: 14, right: 0, bottom: 0);
+    public Thickness H1Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
+    public Thickness H2Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
+    public Thickness H3Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
+    public Thickness H4Margin { get; set; } = new(left: 0, top: 16, right: 0, bottom: 0);
     public Thickness H5Margin { get; set; } = new(left: 0, top: 8, right: 0, bottom: 0);
     public Thickness H6Margin { get; set; } = new(left: 0, top: 8, right: 0, bottom: 0);
 

components/MarkdownTextBlock/src/TextElements/MyHeading.cs

@@ -60,7 +60,15 @@ private void SetHProperties(int level)
             5 => _config.Themes.H5FontSize,
             _ => _config.Themes.H6FontSize,
         };
-        _paragraph.Foreground = _config.Themes.HeadingForeground;
+        _paragraph.Foreground = level switch
+        {
+            1 => _config.Themes.H1Foreground,
+            2 => _config.Themes.H2Foreground,
+            3 => _config.Themes.H3Foreground,
+            4 => _config.Themes.H4Foreground,
+            5 => _config.Themes.H5Foreground,
+            _ => _config.Themes.H6Foreground,
+        };
         _paragraph.FontWeight = level switch
         {
             1 => _config.Themes.H1FontWeight,