fix: adjust font families to use semantic resources (#1090)

unoplatform · Apr 3, 2024 · 6e6cb49 · 6e6cb49
1 parent 476437c
commit 6e6cb49
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/doc/controls/Divider.md b/doc/controls/Divider.md
@@ -14,11 +14,11 @@ A divider is a thin line that groups content in lists and layouts.
 
 ## Lightweight Styling
 
-| Key                              | Type             | Value                     |
-|----------------------------------|------------------|---------------------------|
+| Key                              | Type                 | Value                       |
+|------------------------------------|--------------------|-----------------------------|
 | `DividerForeground`                | `SolidColorBrush`  | `OutlineVariantBrush`       |
 | `DividerSubHeaderForeground`       | `SolidColorBrush`  | `OnSurfaceLowBrush`         |
-| `DividerSubHeaderFontFamily`       | `FontFamily`       | `MaterialMediumFontFamily`  |
+| `DividerSubHeaderFontFamily`       | `FontFamily`       | `BodySmallFontFamily`       |
 | `DividerSubHeaderFontWeight`       | `FontWeight`       | `BodySmallFontWeight`       |
 | `DividerSubHeaderFontSize`         | `FontSize`         | `BodySmallFontSize`         |
 | `DividerSubHeaderCharacterSpacing` | `CharacterSpacing` | `BodySmallCharacterSpacing` |

diff --git a/doc/controls/NavigationBar.md b/doc/controls/NavigationBar.md
@@ -420,7 +420,7 @@ Only supports `BitmapImage` on iOS/Android
 | `NavigationBarForeground`                                              | `SolidColorBrush` | OnSurfaceBrush                          |
 | `NavigationBarBackground`                                              | `SolidColorBrush` | SurfaceBrush                            |
 | `NavigationBarPadding`                                                 | `Thickness`       | 4,0,0,0                                 |
-| `NavigationBarFontFamily`                                              | `FontFamily`      | MaterialRegularFontFamily               |
+| `NavigationBarFontFamily`                                              | `FontFamily`      | TitleLargeFontFamily                    |
 | `NavigationBarFontWeight`                                              | `String`          | TitleLargeFontWeight                    |
 | `NavigationBarFontSize`                                                | `Double`          | TitleLargeFontSize                      |
 | `MaterialModalNavigationBarMainCommandForeground`                      | `SolidColorBrush` | OnSurfaceBrush                          |

diff --git a/doc/material-migration.md b/doc/material-migration.md
@@ -22,7 +22,7 @@ Existing explicit references to `-DisabledLow` resources have been updated to us
 
 ### Markup Theme class name
 
-The `Theme` class in the `Uno.Toolkit.UI.Markup` has been renamed to `ToolkitTheme` in order to no longer clash with the `Theme` class from `Uno.Themes.Markup`. 
+The `Theme` class in the `Uno.Toolkit.UI.Markup` has been renamed to `ToolkitTheme` in order to no longer clash with the `Theme` class from `Uno.Themes.Markup`.
 
 This affects all references to the `Theme` class in the `Uno.Toolkit.UI.Markup` namespace, which are outlined in the table below:
 

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/Chip.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/Chip.xaml
@@ -375,7 +375,7 @@
 														  Content="{TemplateBinding Content}"
 														  ContentTemplate="{TemplateBinding ContentTemplate}"
 														  ContentTransitions="{TemplateBinding ContentTransitions}"
-														  FontFamily="{ThemeResource MaterialMediumFontFamily}"
+														  FontFamily="{ThemeResource LabelLargeFontFamily}"
 														  Foreground="{TemplateBinding Foreground}" />
 
 										<!-- C2: Remove Button -->

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/Divider.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/Divider.xaml
@@ -8,7 +8,7 @@
 			<StaticResource x:Key="DividerForeground" ResourceKey="OutlineVariantBrush" />
 			<StaticResource x:Key="DividerSubHeaderForeground" ResourceKey="OnSurfaceLowBrush" />
 
-			<StaticResource x:Key="DividerSubHeaderFontFamily" ResourceKey="MaterialMediumFontFamily" />
+			<StaticResource x:Key="DividerSubHeaderFontFamily" ResourceKey="BodySmallFontFamily" />
 			<StaticResource x:Key="DividerSubHeaderFontWeight" ResourceKey="BodySmallFontWeight" />
 			<StaticResource x:Key="DividerSubHeaderFontSize" ResourceKey="BodySmallFontSize" />
 			<StaticResource x:Key="DividerSubHeaderCharacterSpacing" ResourceKey="BodySmallCharacterSpacing" />
@@ -20,7 +20,7 @@
 			<StaticResource x:Key="DividerForeground" ResourceKey="OutlineVariantBrush" />
 			<StaticResource x:Key="DividerSubHeaderForeground" ResourceKey="OnSurfaceLowBrush" />
 
-			<StaticResource x:Key="DividerSubHeaderFontFamily" ResourceKey="MaterialMediumFontFamily" />
+			<StaticResource x:Key="DividerSubHeaderFontFamily" ResourceKey="BodySmallFontFamily" />
 			<StaticResource x:Key="DividerSubHeaderFontWeight" ResourceKey="BodySmallFontWeight" />
 			<StaticResource x:Key="DividerSubHeaderFontSize" ResourceKey="BodySmallFontSize" />
 			<StaticResource x:Key="DividerSubHeaderCharacterSpacing" ResourceKey="BodySmallCharacterSpacing" />

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml
@@ -33,7 +33,7 @@
 			<StaticResource x:Key="NavigationBarForeground" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="NavigationBarBackground" ResourceKey="SurfaceBrush" />
 			<Thickness x:Key="NavigationBarPadding">4,0,0,0</Thickness>
-			<StaticResource x:Key="NavigationBarFontFamily" ResourceKey="MaterialRegularFontFamily" />
+			<StaticResource x:Key="NavigationBarFontFamily" ResourceKey="TitleLargeFontFamily" />
 			<StaticResource x:Key="NavigationBarFontWeight" ResourceKey="TitleLargeFontWeight" />
 			<StaticResource x:Key="NavigationBarFontSize" ResourceKey="TitleLargeFontSize" />
 
@@ -93,7 +93,7 @@
 			<StaticResource x:Key="NavigationBarForeground" ResourceKey="OnSurfaceBrush" />
 			<StaticResource x:Key="NavigationBarBackground" ResourceKey="SurfaceBrush" />
 			<Thickness x:Key="NavigationBarPadding">4,0,0,0</Thickness>
-			<StaticResource x:Key="NavigationBarFontFamily" ResourceKey="MaterialRegularFontFamily" />
+			<StaticResource x:Key="NavigationBarFontFamily" ResourceKey="TitleLargeFontFamily" />
 			<StaticResource x:Key="NavigationBarFontWeight" ResourceKey="TitleLargeFontWeight" />
 			<StaticResource x:Key="NavigationBarFontSize" ResourceKey="TitleLargeFontSize" />
 

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml
@@ -634,7 +634,7 @@
         - BottomTabBar (known as NavigationBar in Material Design 3: https://m3.material.io/components/navigation-bar/overview)
     -->
     <Style x:Key="MaterialBaseNavigationTabBarItemStyle" TargetType="utu:TabBarItem">
-        <Setter Property="FontFamily" Value="{ThemeResource MaterialMediumFontFamily}" />
+        <Setter Property="FontFamily" Value="{ThemeResource LabelMediumFontFamily}" />
         <Setter Property="FontSize" Value="{ThemeResource LabelMediumFontSize}" />
         <Setter Property="FontWeight" Value="{ThemeResource LabelMediumFontWeight}" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
@@ -1170,7 +1170,7 @@
 
     <!--#region FAB TabBarItem Styles-->
     <Style x:Key="MaterialBaseFabTabBarItemStyle" TargetType="utu:TabBarItem">
-        <Setter Property="FontFamily" Value="{ThemeResource MaterialMediumFontFamily}" />
+        <Setter Property="FontFamily" Value="{ThemeResource LabelMediumFontFamily}" />
         <Setter Property="FontSize" Value="{ThemeResource LabelMediumFontSize}" />
         <Setter Property="FontWeight" Value="{ThemeResource LabelMediumFontWeight}" />
         <Setter Property="IsSelectable" Value="False" />