chore: pr comments

unoplatform · Apr 2, 2024 · 92a25fe · 92a25fe
1 parent b813fe4
commit 92a25fe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml b/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
@@ -53,21 +53,21 @@
 		<Setter Property="BorderBrush"
 				Value="{ThemeResource SurfaceBrush}" />
 		<Setter Property="DayItemFontFamily"
-				Value="{ThemeResource MaterialRegularFontFamily}" />
+				Value="{ThemeResource BodyLargeFontFamily}" />
 		<Setter Property="DayItemFontSize"
 				Value="14" />
 		<Setter Property="FirstOfMonthLabelFontFamily"
-				Value="{ThemeResource MaterialRegularFontFamily}" />
+				Value="{ThemeResource BodyLargeFontFamily}" />
 		<Setter Property="FirstOfMonthLabelFontSize"
 				Value="0" />
 		<Setter Property="MonthYearItemFontFamily"
-				Value="{ThemeResource MaterialRegularFontFamily}" />
+				Value="{ThemeResource BodyLargeFontFamily}" />
 		<Setter Property="FontFamily"
-				Value="{ThemeResource MaterialRegularFontFamily}" />
+				Value="{ThemeResource BodyLargeFontFamily}" />
 		<Setter Property="MonthYearItemFontSize"
 				Value="14" />
 		<Setter Property="FirstOfYearDecadeLabelFontFamily"
-				Value="{ThemeResource MaterialRegularFontFamily}" />
+				Value="{ThemeResource BodyLargeFontFamily}" />
 		<not_win:Setter Property="CalendarItemBorderThickness"
 						Value="0" />
 		<not_win:Setter Property="BorderThickness"

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ComboBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/ComboBox.xaml
@@ -252,7 +252,7 @@
 		<Setter Property="Foreground" Value="{ThemeResource ComboBoxItemForeground}" />
 
 		<!-- Start: Body Large Typo -->
-		<Setter Property="FontFamily" Value="{ThemeResource MaterialMediumFontFamily}" />
+		<Setter Property="FontFamily" Value="{ThemeResource BodyLargeFontFamily}" />
 		<Setter Property="FontWeight" Value="{ThemeResource BodyLargeFontWeight}" />
 		<Setter Property="FontSize" Value="{ThemeResource BodyLargeFontSize}" />
 		<Setter Property="CharacterSpacing" Value="{ThemeResource BodyLargeCharacterSpacing}" />
@@ -424,7 +424,7 @@
 		<Setter Property="Padding" Value="{ThemeResource ComboBoxPadding}" />
 
 		<!-- Start: Body Large Typo -->
-		<Setter Property="FontFamily" Value="{ThemeResource MaterialMediumFontFamily}" />
+		<Setter Property="FontFamily" Value="{ThemeResource BodyLargeFontFamily}" />
 		<Setter Property="FontWeight" Value="{ThemeResource BodyLargeFontWeight}" />
 		<Setter Property="FontSize" Value="{ThemeResource BodyLargeFontSize}" />
 		<Setter Property="CharacterSpacing" Value="{ThemeResource BodyLargeCharacterSpacing}" />

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ContentDialog.xaml b/src/library/Uno.Material/Styles/Controls/v2/ContentDialog.xaml
@@ -210,7 +210,7 @@
 														Content="{TemplateBinding Title}"
 														ContentTemplate="{TemplateBinding TitleTemplate}"
 														Foreground="{StaticResource MaterialContentDialogTitleForeground}"
-														FontFamily="{ThemeResource MaterialRegularFontFamily}"
+														FontFamily="{ThemeResource HeadlineSmallFontFamily}"
 														FontSize="{StaticResource HeadlineSmallFontSize}"
 														FontWeight="{ThemeResource HeadlineSmallFontWeight}"
 														Margin="{StaticResource MaterialContentDialogTitleToContentMargin}"
@@ -240,7 +240,7 @@
 															  Content="{TemplateBinding Content}"
 															  ContentTemplate="{TemplateBinding ContentTemplate}"
 															  Foreground="{TemplateBinding Foreground}"
-															  FontFamily="{ThemeResource MaterialRegularFontFamily}"
+															  FontFamily="{ThemeResource BodyMediumFontFamily}"
 															  FontSize="{ThemeResource BodyMediumFontSize}"
 															  FontWeight="{ThemeResource BodyMediumFontWeight}"
 															  TextWrapping="Wrap" />

diff --git a/src/library/Uno.Material/Styles/Controls/v2/ListView.xaml b/src/library/Uno.Material/Styles/Controls/v2/ListView.xaml
@@ -8,7 +8,7 @@
 
 
 	<Style x:Key="MaterialListViewItemStyle" TargetType="ListViewItem">
-		<Setter Property="FontFamily" Value="{ThemeResource MaterialRegularFontFamily}" />
+		<Setter Property="FontFamily" Value="{ThemeResource TitleMediumFontFamily}" />
 		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
 		<Setter Property="Background" Value="{ThemeResource ListViewItemBackground}" />
 		<Setter Property="Foreground" Value="{ThemeResource ListViewItemForeground}" />
@@ -413,7 +413,7 @@
 						<TextBlock x:Name="MultiArrangeOverlayText"
 								   Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DragItemsCount}"
 								   Foreground="{ThemeResource ListViewItemDragForegroundThemeBrush}"
-								   FontFamily="{ThemeResource MaterialRegularFontFamily}"
+								   FontFamily="{ThemeResource TitleMediumFontFamily}"
 								   FontSize="26.667"
 								   IsHitTestVisible="False"
 								   Opacity="0"