fix: Multiple typo issues for TextBlock to match Figma and Material M…

…3 guidelines
unoplatform · Jun 2, 2022 · 826e543 · 826e543
1 parent fa24ede
commit 826e543
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/src/library/Uno.Material/Generated/mergedpages.v2.xaml b/src/library/Uno.Material/Generated/mergedpages.v2.xaml
@@ -5310,26 +5310,31 @@
   <Style x:Key="MaterialLabelExtraSmall" BasedOn="{StaticResource MaterialBaseTextBlockStyle}" TargetType="TextBlock">
     <Setter Property="FontSize" Value="11" />
     <Setter Property="LineHeight" Value="16" />
+    <Setter Property="FontWeight" Value="Medium" />
+    <Setter Property="FontFamily" Value="{StaticResource MaterialMediumFontFamily}" />
     <!--  Tracking: 0.1 px  -->
     <Setter Property="CharacterSpacing" Value="7.143" />
   </Style>
   <Style x:Key="MaterialBodyLarge" BasedOn="{StaticResource MaterialBaseTextBlockStyle}" TargetType="TextBlock">
     <Setter Property="FontSize" Value="16" />
     <Setter Property="LineHeight" Value="24" />
+    <Setter Property="FontWeight" Value="Medium" />
     <Setter Property="FontFamily" Value="{StaticResource MaterialMediumFontFamily}" />
-    <!--  Tracking: 0.15 px  -->
-    <Setter Property="CharacterSpacing" Value="9.375" />
+    <!--  Tracking: 0.5 px  -->
+    <Setter Property="CharacterSpacing" Value="45.454" />
   </Style>
   <Style x:Key="MaterialBodyMedium" BasedOn="{StaticResource MaterialBaseTextBlockStyle}" TargetType="TextBlock">
     <Setter Property="FontSize" Value="14" />
     <Setter Property="LineHeight" Value="20" />
+    <Setter Property="FontWeight" Value="Medium" />
     <Setter Property="FontFamily" Value="{StaticResource MaterialMediumFontFamily}" />
     <!--  Tracking: 0.25 px  -->
     <Setter Property="CharacterSpacing" Value="17.857" />
   </Style>
   <Style x:Key="MaterialBodySmall" BasedOn="{StaticResource MaterialBaseTextBlockStyle}" TargetType="TextBlock">
     <Setter Property="FontSize" Value="12" />
     <Setter Property="LineHeight" Value="16" />
+    <Setter Property="FontWeight" Value="Medium" />
     <Setter Property="FontFamily" Value="{StaticResource MaterialMediumFontFamily}" />
     <!--  Tracking: 0.4 px  -->
     <Setter Property="CharacterSpacing" Value="33.333" />
@@ -5339,8 +5344,8 @@
     <Setter Property="LineHeight" Value="18" />
     <Setter Property="FontWeight" Value="Medium" />
     <Setter Property="FontFamily" Value="{StaticResource MaterialMediumFontFamily}" />
-    <!--  Tracking: 0.15 px  -->
-    <Setter Property="CharacterSpacing" Value="9.375" />
+    <!--  Tracking: -0.5 px  -->
+    <Setter Property="CharacterSpacing" Value="-45.454" />
   </Style>
   <Style x:Key="MaterialCaptionMedium" BasedOn="{StaticResource MaterialBaseTextBlockStyle}" TargetType="TextBlock">
     <Setter Property="FontSize" Value="12" />

diff --git a/src/library/Uno.Material/Styles/Controls/v2/TextBlock.xaml b/src/library/Uno.Material/Styles/Controls/v2/TextBlock.xaml
@@ -198,6 +198,10 @@
                 Value="11" />
 		<Setter Property="LineHeight"
                 Value="16" />
+		<Setter Property="FontWeight"
+				Value="Medium" />
+		<Setter Property="FontFamily"
+				Value="{StaticResource MaterialMediumFontFamily}" />
 		<!--  Tracking: 0.1 px  -->
 		<Setter Property="CharacterSpacing"
                 Value="7.143" />
@@ -216,10 +220,10 @@
                 Value="Medium" />
         <Setter Property="FontFamily"
                 Value="{StaticResource MaterialMediumFontFamily}" />
-        <!--  Tracking: 0.15 px  -->
-        <Setter Property="CharacterSpacing"
-                Value="9.375" />
-    </Style>
+		<!--  Tracking: 0.5 px  -->
+		<Setter Property="CharacterSpacing"
+				Value="45.454" />
+	</Style>
 
     <!--  Body Medium  -->
     <Style x:Key="MaterialBodyMedium"
@@ -270,9 +274,9 @@
                 Value="Medium" />
 		<Setter Property="FontFamily"
                 Value="{StaticResource MaterialMediumFontFamily}" />
-		<!--  Tracking: 0.15 px  -->
+		<!--  Tracking: -0.5 px  -->
 		<Setter Property="CharacterSpacing"
-                Value="9.375" />
+				Value="-45.454" />
 	</Style>
 
 	<!--  Caption Medium  -->