Merge pull request #338 from GID0317/Gallery-Fix-Typography-page

Gallery-Fix: Typography page unusual bright brush card fix

Author: NotYoojun

source/iNKORE.UI.WPF.Modern.Gallery/Controls/UserControls/TypographyControl.xaml

@@ -9,7 +9,13 @@
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls.UserControls"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    Background="Transparent">
+    <UserControl.Template>
+        <ControlTemplate TargetType="UserControl">
+            <ContentPresenter />
+        </ControlTemplate>
+    </UserControl.Template>
 
     <Grid MinHeight="68" Background="Transparent">
         <Border

source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Foundation/Design/TypographyPage.xaml

@@ -188,33 +188,33 @@
                                 <TextBlock
                                     Margin="16,0,0,0"
                                     Style="{DynamicResource CaptionTextBlockStyle}"
-                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                                    Foreground="{DynamicResource {x:Static ui:ThemeKeys.TextFillColorSecondaryBrushKey}}"
                                     Text="Example" />
                                 <TextBlock
                                     Grid.Column="1"
                                     Style="{DynamicResource CaptionTextBlockStyle}"
-                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                                    Foreground="{DynamicResource {x:Static ui:ThemeKeys.TextFillColorSecondaryBrushKey}}"
                                     Text="Variable Font" />
                                 <TextBlock
                                     Grid.Column="2"
                                     Style="{DynamicResource CaptionTextBlockStyle}"
-                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                                    Foreground="{DynamicResource {x:Static ui:ThemeKeys.TextFillColorSecondaryBrushKey}}"
                                     Text="Size/Line height" />
                                 <TextBlock
                                     Grid.Column="3"
                                     Style="{DynamicResource CaptionTextBlockStyle}"
-                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                                    Foreground="{DynamicResource {x:Static ui:ThemeKeys.TextFillColorSecondaryBrushKey}}"
                                     Text="Style" />
                                 <TextBlock
                                     Grid.Column="4"
                                     Style="{DynamicResource CaptionTextBlockStyle}"
-                                    Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+                                    Foreground="{DynamicResource {x:Static ui:ThemeKeys.TextFillColorSecondaryBrushKey}}"
                                     Text="Usage (XAML)" FontWeight="SemiBold" />
                             </Grid>
 
                             <uc:TypographyControl
                                 HorizontalAlignment="Stretch"
-                                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                                Background="{DynamicResource {x:Static ui:ThemeKeys.CardBackgroundFillColorDefaultBrushKey}}"
                                 Example="Caption"
                                 ExampleStyle="{DynamicResource CaptionTextBlockStyle}"
                                 VariableFont="Small, Regular"
@@ -231,7 +231,7 @@
                                 Weight="400" />
 
                             <uc:TypographyControl
-                                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                                Background="{DynamicResource {x:Static ui:ThemeKeys.CardBackgroundFillColorDefaultBrushKey}}"
                                 Example="Body Strong"
                                 ExampleStyle="{DynamicResource BodyStrongTextBlockStyle}"
                                 VariableFont="Text, SemiBold"
@@ -248,7 +248,7 @@
                                 Weight="600" />
 
                             <uc:TypographyControl
-                                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                                Background="{DynamicResource {x:Static ui:ThemeKeys.CardBackgroundFillColorDefaultBrushKey}}"
                                 Example="Title"
                                 ExampleStyle="{DynamicResource TitleTextBlockStyle}"
                                 VariableFont="Display, SemiBold"
@@ -265,7 +265,7 @@
                                 Weight="600" />
 
                             <uc:TypographyControl
-                                Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
+                                Background="{DynamicResource {x:Static ui:ThemeKeys.CardBackgroundFillColorDefaultBrushKey}}"
                                 Example="Display"
                                 ExampleStyle="{DynamicResource DisplayTextBlockStyle}"
                                 VariableFont="Display, SemiBold"

source/iNKORE.UI.WPF.Modern.Gallery/Pages/Controls/Foundation/Design/TypographyPage.xaml.cs

@@ -219,11 +219,6 @@ private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e
             e.Handled = true;
         }
 
-        private void UpdateExampleCode()
-        {
-            Example1.Xaml = Example1Xaml;
-        }
-
         // Button click handlers for typography info buttons
         private void ShowTypographyButtonClick1(object sender, RoutedEventArgs e)
         {
@@ -256,6 +251,11 @@ private void ShowTypographyButtonClick5(object sender, RoutedEventArgs e)
             System.Windows.MessageBox.Show("Display: Display, SemiBold - 68/92 epx\nStyle: DisplayTextBlockStyle", "Typography Info", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Information);
         }
 
+        private void UpdateExampleCode()
+        {
+            Example1.Xaml = Example1Xaml;
+        }
+
         string Example1Xaml => @"
 <TextBlock Text=""Caption"" Style=""{StaticResource {x:Static ui:ThemeKeys.CaptionTextBlockStyleKey}}""/>
 <TextBlock Text=""Body"" Style=""{StaticResource {x:Static ui:ThemeKeys.BodyTextBlockStyleKey}}""/>