Revert "Code Quality: Replaced BoolToVisibilityConverter with impli…

…cit conversion expression (#16723)" This reverts commit a8a9c27.
files-community · Jan 28, 2025 · e19e194 · e19e194
1 parent 4f266fa
commit e19e194
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 19 deletions.
diff --git a/src/Files.App/Styles/StatusCenterStyles.xaml b/src/Files.App/Styles/StatusCenterStyles.xaml
@@ -64,6 +64,7 @@
 		SuccessfulForegroundBrush="{ThemeResource SystemFillColorSuccessBrush}" />
 
 	<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
+	<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 	<wctconverters:BoolToObjectConverter
 		x:Key="NegateBoolToVisibilityConverter"
 		FalseValue="Visible"

diff --git a/src/Files.App/UserControls/StatusCenter/StatusCenter.xaml b/src/Files.App/UserControls/StatusCenter/StatusCenter.xaml
@@ -204,7 +204,7 @@
 							Grid.Row="1"
 							Margin="0,8,0,8"
 							ColumnSpacing="4"
-							Visibility="{x:Bind IsInProgress, Mode=OneWay}">
+							Visibility="{x:Bind IsInProgress, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
 							<Grid.RowDefinitions>
 								<RowDefinition Height="Auto" />
 								<RowDefinition Height="Auto" />
@@ -233,7 +233,7 @@
 								BorderBrush="{ThemeResource ControlStrongStrokeColorDefaultBrush}"
 								BorderThickness="1"
 								CornerRadius="4"
-								Visibility="{x:Bind IsExpanded, Mode=OneWay}">
+								Visibility="{x:Bind IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
 
 								<Grid Padding="-2,-2,-2,-2">
 									<local:SpeedGraph Points="{x:Bind SpeedGraphValues, Mode=OneWay}" />
@@ -284,7 +284,7 @@
 									Visibility="{x:Bind IsExpanded, Converter={StaticResource NegateBoolToVisibilityConverter}, Mode=OneWay}" />
 
 								<!--  Detailed Info (Displayed When Graph Expanded)  -->
-								<StackPanel Spacing="2" Visibility="{x:Bind IsExpanded, Mode=OneWay}">
+								<StackPanel Spacing="2" Visibility="{x:Bind IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
 
 									<TextBlock
 										x:Name="StatusCenterItemCurrentProcessingItemNameTextBlock"
@@ -329,7 +329,7 @@
 									DataContext="{x:Bind}"
 									IsEnabled="{x:Bind IsCancelable, Mode=OneWay}"
 									ToolTipService.ToolTip="{helpers:ResourceString Name=Cancel}"
-									Visibility="{x:Bind IsInProgress, Mode=OneWay}">
+									Visibility="{x:Bind IsInProgress, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
 									<Button.Content>
 										<FontIcon FontSize="16" Glyph="&#xE711;" />
 									</Button.Content>

diff --git a/src/Files.App/UserControls/TabBar/TabBar.xaml b/src/Files.App/UserControls/TabBar/TabBar.xaml
@@ -59,6 +59,8 @@
 				</ResourceDictionary>
 			</ResourceDictionary.MergedDictionaries>
 
+			<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+
 		</ResourceDictionary>
 	</local:BaseTabBar.Resources>
 
@@ -104,7 +106,7 @@
 					Background="Transparent"
 					BorderThickness="0"
 					ToolTipService.ToolTip="{helpers:ResourceString Name=TabActions}"
-					Visibility="{x:Bind ShowTabActionsButton, Mode=OneWay}">
+					Visibility="{x:Bind ShowTabActionsButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
 
 					<controls:ThemedIcon
 						Width="16"

diff --git a/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml b/src/Files.App/Views/Layouts/ColumnLayoutPage.xaml
@@ -1,4 +1,4 @@
-<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
+<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
 <local:BaseGroupableLayoutPage
 	x:Class="Files.App.Views.Layouts.ColumnLayoutPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -27,6 +27,10 @@
 			x:Key="NegatedBoolToVisibilityConverter"
 			FalseValue="Visible"
 			TrueValue="Collapsed" />
+		<wctconverters:BoolToVisibilityConverter
+			x:Key="BoolToVisibilityConverter"
+			FalseValue="Collapsed"
+			TrueValue="Visible" />
 		<wctconverters:EmptyObjectToObjectConverter
 			x:Key="EmptyObjectToObjectConverter"
 			EmptyValue="Collapsed"
@@ -379,15 +383,15 @@
 												FontSize="14"
 												Style="{StaticResource SubheaderTextBlockStyle}"
 												Text="{x:Bind Model.Subtext, Mode=OneWay}"
-												Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
+												Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 										</StackPanel>
 
 										<TextBlock
 											Margin="0,2,0,0"
 											Style="{StaticResource App.Theme.BodyTextBlockStyle}"
 											Text="{x:Bind Model.CountText, Mode=OneWay}"
-											Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
+											Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 									</StackPanel>
 								</DataTemplate>
@@ -456,15 +460,15 @@
 											Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
 											Style="{StaticResource SubheaderTextBlockStyle}"
 											Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.Subtext, Mode=OneWay}"
-											Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
+											Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 									</StackPanel>
 
 									<TextBlock
 										Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
 										Style="{StaticResource App.Theme.BodyTextBlockStyle}"
 										Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
-										Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
+										Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 								</StackPanel>
 

diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml
@@ -1416,14 +1416,14 @@
 												FontSize="14"
 												Style="{StaticResource SubheaderTextBlockStyle}"
 												Text="{x:Bind Model.Subtext, Mode=OneWay}"
-												Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
+												Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 										</StackPanel>
 
 										<TextBlock
 											Margin="0,2,0,0"
 											Style="{StaticResource App.Theme.BodyTextBlockStyle}"
 											Text="{x:Bind Model.CountText, Mode=OneWay}"
-											Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
+											Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 									</StackPanel>
 								</DataTemplate>
@@ -1492,13 +1492,13 @@
 											Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
 											Style="{StaticResource SubheaderTextBlockStyle}"
 											Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.Subtext, Mode=OneWay}"
-											Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
+											Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 									</StackPanel>
 									<TextBlock
 										Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
 										Style="{StaticResource App.Theme.BodyTextBlockStyle}"
 										Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
-										Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
+										Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 								</StackPanel>
 							</StackPanel>
 						</DataTemplate>

diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml b/src/Files.App/Views/Layouts/GridLayoutPage.xaml
@@ -81,6 +81,10 @@
 			x:Key="NegatedBoolToOpacityConverter"
 			FalseValue="1"
 			TrueValue="0" />
+		<wctconverters:BoolToVisibilityConverter
+			x:Key="BoolToVisibilityConverter"
+			FalseValue="Collapsed"
+			TrueValue="Visible" />
 		<converters:BoolToSelectionModeConverter x:Key="BoolToSelectionModeConverter" />
 
 		<!--  Grid View  -->
@@ -1075,14 +1079,14 @@
 											FontSize="14"
 											Style="{StaticResource SubheaderTextBlockStyle}"
 											Text="{x:Bind Model.Subtext, Mode=OneWay}"
-											Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
+											Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 										<TextBlock
 											Grid.Row="1"
 											Grid.ColumnSpan="3"
 											Style="{StaticResource App.Theme.BodyTextBlockStyle}"
 											Text="{x:Bind Model.CountText, Mode=OneWay}"
-											Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay}" />
+											Visibility="{x:Bind Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 									</Grid>
 								</DataTemplate>
@@ -1164,7 +1168,7 @@
 									Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
 									Style="{StaticResource SubheaderTextBlockStyle}"
 									Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.Subtext, Mode=OneWay}"
-									Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
+									Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 								<TextBlock
 									Grid.Row="1"
@@ -1173,7 +1177,7 @@
 									Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
 									Style="{StaticResource App.Theme.BodyTextBlockStyle}"
 									Text="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.CountText, Mode=OneWay}"
-									Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay}" />
+									Visibility="{x:Bind ((storage:IGroupedCollectionHeader)Group).Model.ShowCountTextBelow, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
 
 							</Grid>
 						</DataTemplate>

diff --git a/src/Files.App/Views/Properties/LibraryPage.xaml b/src/Files.App/Views/Properties/LibraryPage.xaml
@@ -107,7 +107,7 @@
 								<ColumnDefinition Width="36" />
 								<ColumnDefinition />
 							</Grid.ColumnDefinitions>
-							<FontIcon Glyph="&#xE73E;" Visibility="{x:Bind IsDefault, Mode=OneWay}" />
+							<FontIcon Glyph="&#xE73E;" Visibility="{x:Bind IsDefault, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />
 							<TextBlock
 								Grid.Column="2"
 								Margin="0,0,0,2"

diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml b/src/Files.App/Views/Properties/MainPropertiesPage.xaml
@@ -28,6 +28,7 @@
 			</ResourceDictionary.MergedDictionaries>
 
 			<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
+			<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
 			<wctconverters:BoolToVisibilityConverter
 				x:Key="BoolToVisibilityInverseConverter"
 				FalseValue="Visible"

diff --git a/src/Files.App/Views/Shells/ColumnShellPage.xaml b/src/Files.App/Views/Shells/ColumnShellPage.xaml
@@ -14,6 +14,7 @@
 
 	<local:BaseShellPage.Resources>
 		<ResourceDictionary>
+			<wctconverters:BoolToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 			<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
 		</ResourceDictionary>
 	</local:BaseShellPage.Resources>