Skip to content

Commit a8a9c27

Browse files
LamparterLamparter
authored
Code Quality: Replaced BoolToVisibilityConverter with implicit conversion expression (#16723)
Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com>
1 parent 9a2dacf commit a8a9c27

File tree

9 files changed

+19
-32
lines changed

9 files changed

+19
-32
lines changed

‎src/Files.App/Styles/StatusCenterStyles.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
SuccessfulForegroundBrush="{ThemeResource SystemFillColorSuccessBrush}" />
6565

6666
<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
67-
<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
6867
<wctconverters:BoolToObjectConverter
6968
x:Key="NegateBoolToVisibilityConverter"
7069
FalseValue="Visible"

‎src/Files.App/UserControls/StatusCenter/StatusCenter.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
Grid.Row="1"
205205
Margin="0,8,0,8"
206206
ColumnSpacing="4"
207-
Visibility="{x:Bind IsInProgress, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
207+
Visibility="{x:Bind IsInProgress, Mode=OneWay}">
208208
<Grid.RowDefinitions>
209209
<RowDefinition Height="Auto" />
210210
<RowDefinition Height="Auto" />
@@ -233,7 +233,7 @@
233233
BorderBrush="{ThemeResource ControlStrongStrokeColorDefaultBrush}"
234234
BorderThickness="1"
235235
CornerRadius="4"
236-
Visibility="{x:Bind IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
236+
Visibility="{x:Bind IsExpanded, Mode=OneWay}">
237237

238238
<Grid Padding="-2,-2,-2,-2">
239239
<local:SpeedGraph Points="{x:Bind SpeedGraphValues, Mode=OneWay}" />
@@ -284,7 +284,7 @@
284284
Visibility="{x:Bind IsExpanded, Converter={StaticResource NegateBoolToVisibilityConverter}, Mode=OneWay}" />
285285

286286
<!-- Detailed Info (Displayed When Graph Expanded) -->
287-
<StackPanel Spacing="2" Visibility="{x:Bind IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
287+
<StackPanel Spacing="2" Visibility="{x:Bind IsExpanded, Mode=OneWay}">
288288

289289
<TextBlock
290290
x:Name="StatusCenterItemCurrentProcessingItemNameTextBlock"
@@ -329,7 +329,7 @@
329329
DataContext="{x:Bind}"
330330
IsEnabled="{x:Bind IsCancelable, Mode=OneWay}"
331331
ToolTipService.ToolTip="{helpers:ResourceString Name=Cancel}"
332-
Visibility="{x:Bind IsInProgress, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
332+
Visibility="{x:Bind IsInProgress, Mode=OneWay}">
333333
<Button.Content>
334334
<FontIcon FontSize="16" Glyph="&#xE711;" />
335335
</Button.Content>

‎src/Files.App/UserControls/TabBar/TabBar.xaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@
5959
</ResourceDictionary>
6060
</ResourceDictionary.MergedDictionaries>
6161

62-
<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
63-
6462
</ResourceDictionary>
6563
</local:BaseTabBar.Resources>
6664

@@ -106,7 +104,7 @@
106104
Background="Transparent"
107105
BorderThickness="0"
108106
ToolTipService.ToolTip="{helpers:ResourceString Name=TabActions}"
109-
Visibility="{x:Bind ShowTabActionsButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
107+
Visibility="{x:Bind ShowTabActionsButton, Mode=OneWay}">
110108

111109
<controls:ThemedIcon
112110
Width="16"

‎src/Files.App/Views/Layouts/ColumnLayoutPage.xaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
1+
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
22
<local:BaseGroupableLayoutPage
33
x:Class="Files.App.Views.Layouts.ColumnLayoutPage"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -27,10 +27,6 @@
2727
x:Key="NegatedBoolToVisibilityConverter"
2828
FalseValue="Visible"
2929
TrueValue="Collapsed" />
30-
<wctconverters:BoolToVisibilityConverter
31-
x:Key="BoolToVisibilityConverter"
32-
FalseValue="Collapsed"
33-
TrueValue="Visible" />
3430
<wctconverters:EmptyObjectToObjectConverter
3531
x:Key="EmptyObjectToObjectConverter"
3632
EmptyValue="Collapsed"
@@ -383,15 +379,15 @@
383379
FontSize="14"
384380
Style="{StaticResource SubheaderTextBlockStyle}"
385381
Text="{x:Bind Model.Subtext, Mode=OneWay}"
386-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
382+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
387383

388384
</StackPanel>
389385

390386
<TextBlock
391387
Margin="0,2,0,0"
392388
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
393389
Text="{x:Bind Model.CountText, Mode=OneWay}"
394-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
390+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
395391

396392
</StackPanel>
397393
</DataTemplate>
@@ -460,15 +456,15 @@
460456
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
461457
Style="{StaticResource SubheaderTextBlockStyle}"
462458
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.Subtext, Mode=OneWay}"
463-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
459+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
464460

465461
</StackPanel>
466462

467463
<TextBlock
468464
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
469465
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
470466
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
471-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
467+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
472468

473469
</StackPanel>
474470

‎src/Files.App/Views/Layouts/DetailsLayoutPage.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,14 +1416,14 @@
14161416
FontSize="14"
14171417
Style="{StaticResource SubheaderTextBlockStyle}"
14181418
Text="{x:Bind Model.Subtext, Mode=OneWay}"
1419-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
1419+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
14201420
</StackPanel>
14211421

14221422
<TextBlock
14231423
Margin="0,2,0,0"
14241424
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
14251425
Text="{x:Bind Model.CountText, Mode=OneWay}"
1426-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
1426+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
14271427

14281428
</StackPanel>
14291429
</DataTemplate>
@@ -1492,13 +1492,13 @@
14921492
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
14931493
Style="{StaticResource SubheaderTextBlockStyle}"
14941494
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.Subtext, Mode=OneWay}"
1495-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
1495+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
14961496
</StackPanel>
14971497
<TextBlock
14981498
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
14991499
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
15001500
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
1501-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
1501+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
15021502
</StackPanel>
15031503
</StackPanel>
15041504
</DataTemplate>

‎src/Files.App/Views/Layouts/GridLayoutPage.xaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@
8181
x:Key="NegatedBoolToOpacityConverter"
8282
FalseValue="1"
8383
TrueValue="0" />
84-
<wctconverters:BoolToVisibilityConverter
85-
x:Key="BoolToVisibilityConverter"
86-
FalseValue="Collapsed"
87-
TrueValue="Visible" />
8884
<converters:BoolToSelectionModeConverter x:Key="BoolToSelectionModeConverter" />
8985

9086
<!-- Grid View -->
@@ -1079,14 +1075,14 @@
10791075
FontSize="14"
10801076
Style="{StaticResource SubheaderTextBlockStyle}"
10811077
Text="{x:Bind Model.Subtext, Mode=OneWay}"
1082-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
1078+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
10831079

10841080
<TextBlock
10851081
Grid.Row="1"
10861082
Grid.ColumnSpan="3"
10871083
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
10881084
Text="{x:Bind Model.CountText, Mode=OneWay}"
1089-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
1085+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
10901086

10911087
</Grid>
10921088
</DataTemplate>
@@ -1168,7 +1164,7 @@
11681164
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
11691165
Style="{StaticResource SubheaderTextBlockStyle}"
11701166
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.Subtext, Mode=OneWay}"
1171-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
1167+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
11721168

11731169
<TextBlock
11741170
Grid.Row="1"
@@ -1177,7 +1173,7 @@
11771173
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
11781174
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
11791175
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
1180-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
1176+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
11811177

11821178
</Grid>
11831179
</DataTemplate>

‎src/Files.App/Views/Properties/LibraryPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<ColumnDefinition Width="36" />
108108
<ColumnDefinition />
109109
</Grid.ColumnDefinitions>
110-
<FontIcon Glyph="&#xE73E;" Visibility="{x:Bind IsDefault, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
110+
<FontIcon Glyph="&#xE73E;" Visibility="{x:Bind IsDefault, Mode=OneWay}" />
111111
<TextBlock
112112
Grid.Column="2"
113113
Margin="0,0,0,2"

‎src/Files.App/Views/Properties/MainPropertiesPage.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
</ResourceDictionary.MergedDictionaries>
2929

3030
<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
31-
<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
3231
<wctconverters:BoolToVisibilityConverter
3332
x:Key="BoolToVisibilityInverseConverter"
3433
FalseValue="Visible"

‎src/Files.App/Views/Shells/ColumnShellPage.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
<local:BaseShellPage.Resources>
1616
<ResourceDictionary>
17-
<wctconverters:BoolToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
1817
<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
1918
</ResourceDictionary>
2019
</local:BaseShellPage.Resources>

0 commit comments

Comments
 (0)