Skip to content

Commit 9941918

Browse files
Use styles & strings
1 parent 04cf0c9 commit 9941918

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/Files.App/Strings/en-US/Resources.resw

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4004,4 +4004,10 @@
40044004
<data name="ManageTags" xml:space="preserve">
40054005
<value>Manage tags</value>
40064006
</data>
4007+
<data name="Available" xml:space="preserve">
4008+
<value>Available</value>
4009+
</data>
4010+
<data name="Total" xml:space="preserve">
4011+
<value>Total</value>
4012+
</data>
40074013
</root>

src/Files.App/UserControls/Pane/InfoPane.xaml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,8 @@
244244
x:Name="DriveFormatAndTypeTextBlock"
245245
Margin="12,12,12,24"
246246
HorizontalAlignment="Center"
247-
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
248-
FontSize="14"
249247
IsTextSelectionEnabled="True"
248+
Style="{ThemeResource BodyTextBlockStyle}"
250249
TextAlignment="Center"
251250
TextWrapping="Wrap"
252251
Visibility="Collapsed">
@@ -257,11 +256,9 @@
257256
<TextBlock
258257
x:Name="UsedSpaceTextBlock"
259258
HorizontalAlignment="Center"
260-
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
261-
FontSize="20"
262-
FontWeight="Bold"
263259
Foreground="{ThemeResource SystemAccentColor}"
264260
IsTextSelectionEnabled="True"
261+
Style="{ThemeResource SubtitleTextBlockStyle}"
265262
Text="{x:Bind ViewModel.SelectedDriveItem.UsedSpaceText, Mode=OneWay}"
266263
TextAlignment="Center"
267264
TextWrapping="Wrap"
@@ -293,41 +290,38 @@
293290
x:Name="AvailableSpaceTextBlock"
294291
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
295292
FontSize="14"
296-
FontWeight="Bold"
297293
IsTextSelectionEnabled="True"
294+
Style="{ThemeResource BodyStrongTextBlockStyle}"
298295
Text="{x:Bind ViewModel.SelectedDriveItem.FreeSpaceText, Mode=OneWay}"
299296
TextAlignment="Left"
300297
TextWrapping="Wrap" />
301298
<TextBlock
302299
x:Name="TotalDriveSpaceTextBlock"
303300
Grid.Column="2"
304-
FontSize="14"
305-
FontWeight="Bold"
301+
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
306302
IsTextSelectionEnabled="True"
307-
Style="{StaticResource Local.FileDetailsHeaderTextBlockStyle}"
303+
Style="{ThemeResource BodyStrongTextBlockStyle}"
308304
Text="{x:Bind ViewModel.SelectedDriveItem.MaxSpaceText, Mode=OneWay}"
309305
TextAlignment="Right"
310306
TextWrapping="Wrap" />
311307
<TextBlock
312308
x:Name="AvailableSpaceLabel"
313309
Grid.Row="1"
314310
HorizontalAlignment="Left"
315-
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
316-
FontSize="14"
317311
IsTextSelectionEnabled="True"
318-
Text="Available"
312+
Style="{ThemeResource BodyTextBlockStyle}"
313+
Text="{helpers:ResourceString Name=Available}"
319314
TextAlignment="Left"
320315
TextWrapping="Wrap" />
321316
<TextBlock
322317
x:Name="TotalDriveSpaceLabel"
323318
Grid.Row="1"
324319
Grid.Column="2"
325320
HorizontalAlignment="Right"
326-
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
327-
FontSize="14"
328321
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
329322
IsTextSelectionEnabled="True"
330-
Text="Total"
323+
Style="{ThemeResource BodyTextBlockStyle}"
324+
Text="{helpers:ResourceString Name=Total}"
331325
TextAlignment="Right"
332326
TextWrapping="Wrap" />
333327
</Grid>

0 commit comments

Comments
 (0)