Skip to content

Commit e19e194

Browse files
yaira2yaira2
committed
Revert "Code Quality: Replaced BoolToVisibilityConverter with implicit conversion expression (#16723)"
This reverts commit a8a9c27.
1 parent 4f266fa commit e19e194

File tree

9 files changed

+32
-19
lines changed

9 files changed

+32
-19
lines changed

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

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

6666
<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
67+
<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
6768
<wctconverters:BoolToObjectConverter
6869
x:Key="NegateBoolToVisibilityConverter"
6970
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, Mode=OneWay}">
207+
Visibility="{x:Bind IsInProgress, Converter={StaticResource BoolToVisibilityConverter}, 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, Mode=OneWay}">
236+
Visibility="{x:Bind IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, 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, Mode=OneWay}">
287+
<StackPanel Spacing="2" Visibility="{x:Bind IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, 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, Mode=OneWay}">
332+
Visibility="{x:Bind IsInProgress, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
333333
<Button.Content>
334334
<FontIcon FontSize="16" Glyph="&#xE711;" />
335335
</Button.Content>

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

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

62+
<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
63+
6264
</ResourceDictionary>
6365
</local:BaseTabBar.Resources>
6466

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

109111
<controls:ThemedIcon
110112
Width="16"

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

Lines changed: 9 additions & 5 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,6 +27,10 @@
2727
x:Key="NegatedBoolToVisibilityConverter"
2828
FalseValue="Visible"
2929
TrueValue="Collapsed" />
30+
<wctconverters:BoolToVisibilityConverter
31+
x:Key="BoolToVisibilityConverter"
32+
FalseValue="Collapsed"
33+
TrueValue="Visible" />
3034
<wctconverters:EmptyObjectToObjectConverter
3135
x:Key="EmptyObjectToObjectConverter"
3236
EmptyValue="Collapsed"
@@ -379,15 +383,15 @@
379383
FontSize="14"
380384
Style="{StaticResource SubheaderTextBlockStyle}"
381385
Text="{x:Bind Model.Subtext, Mode=OneWay}"
382-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
386+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
383387

384388
</StackPanel>
385389

386390
<TextBlock
387391
Margin="0,2,0,0"
388392
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
389393
Text="{x:Bind Model.CountText, Mode=OneWay}"
390-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
394+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
391395

392396
</StackPanel>
393397
</DataTemplate>
@@ -456,15 +460,15 @@
456460
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
457461
Style="{StaticResource SubheaderTextBlockStyle}"
458462
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.Subtext, Mode=OneWay}"
459-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
463+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
460464

461465
</StackPanel>
462466

463467
<TextBlock
464468
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
465469
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
466470
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
467-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
471+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
468472

469473
</StackPanel>
470474

‎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}" />
1419+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
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}" />
1426+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
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}" />
1495+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
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}" />
1501+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
15021502
</StackPanel>
15031503
</StackPanel>
15041504
</DataTemplate>

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

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

8690
<!-- Grid View -->
@@ -1075,14 +1079,14 @@
10751079
FontSize="14"
10761080
Style="{StaticResource SubheaderTextBlockStyle}"
10771081
Text="{x:Bind Model.Subtext, Mode=OneWay}"
1078-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
1082+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
10791083

10801084
<TextBlock
10811085
Grid.Row="1"
10821086
Grid.ColumnSpan="3"
10831087
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
10841088
Text="{x:Bind Model.CountText, Mode=OneWay}"
1085-
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
1089+
Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
10861090

10871091
</Grid>
10881092
</DataTemplate>
@@ -1164,7 +1168,7 @@
11641168
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
11651169
Style="{StaticResource SubheaderTextBlockStyle}"
11661170
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.Subtext, Mode=OneWay}"
1167-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
1171+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
11681172

11691173
<TextBlock
11701174
Grid.Row="1"
@@ -1173,7 +1177,7 @@
11731177
Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
11741178
Style="{StaticResource App.Theme.BodyTextBlockStyle}"
11751179
Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
1176-
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
1180+
Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
11771181

11781182
</Grid>
11791183
</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, Mode=OneWay}" />
110+
<FontIcon Glyph="&#xE73E;" Visibility="{x:Bind IsDefault, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
111111
<TextBlock
112112
Grid.Column="2"
113113
Margin="0,0,0,2"

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

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

3030
<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
31+
<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
3132
<wctconverters:BoolToVisibilityConverter
3233
x:Key="BoolToVisibilityInverseConverter"
3334
FalseValue="Visible"

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

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

1515
<local:BaseShellPage.Resources>
1616
<ResourceDictionary>
17+
<wctconverters:BoolToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
1718
<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
1819
</ResourceDictionary>
1920
</local:BaseShellPage.Resources>

0 commit comments

Comments
 (0)