Skip to content

Code Quality: Simplified binding statements #16930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 18, 2025
Merged

Code Quality: Simplified binding statements #16930

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ab072b
Code Quality: Bound properties to Commands and set binding mode to on…
Jack251970 Mar 14, 2025
5b0d39e
Code Quality: Used ResourcesStrings helper to bind strings
Jack251970 Mar 14, 2025
b13937d
Code Quality: Bound event to local function
Jack251970 Mar 14, 2025
e65d6da
Code Quality: Fixed WMC1506 & WMC1507 build warning
Jack251970 Mar 14, 2025
b57428d
Revert "Code Quality: Fixed WMC1506 & WMC1507 build warning"
Jack251970 Mar 14, 2025
56c5014
Code Quality: Organized binding modes
Jack251970 Mar 14, 2025
59578de
Code Quality: Used one-way binding mode for automation properties
Jack251970 Mar 16, 2025
0518333
Revert "Code Quality: Bound event to local function"
Jack251970 Mar 17, 2025
8f62bcb
Code Quality: Used one-time binding mode for glyph
Jack251970 Mar 17, 2025
c82084d
Code Quality: Added one-time binding mode for glyph
Jack251970 Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 32 additions & 33 deletions src/Files.App/UserControls/NavigationToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,13 @@
x:Name="Back"
AccessKey="B"
AccessKeyInvoked="Button_AccessKeyInvoked"
AutomationProperties.FullDescription="{x:Bind ViewModel.Commands.NavigateBack.Description, Mode=OneWay}"
AutomationProperties.Name="{x:Bind ViewModel.Commands.NavigateBack.Label, Mode=OneWay}"
Command="{x:Bind ViewModel.Commands.NavigateBack, Mode=OneWay}"
IsEnabled="{x:Bind ViewModel.Commands.NavigateBack.IsExecutable, Mode=OneWay}"
AutomationProperties.FullDescription="{x:Bind Commands.NavigateBack.Description, Mode=OneWay}"
AutomationProperties.Name="{x:Bind Commands.NavigateBack.Label, Mode=OneWay}"
Command="{x:Bind Commands.NavigateBack, Mode=OneWay}"
IsEnabled="{x:Bind Commands.NavigateBack.IsExecutable, Mode=OneWay}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{x:Bind ViewModel.Commands.NavigateBack.LabelWithHotKey, Mode=OneWay}">
<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.Commands.NavigateBack.Glyph.BaseGlyph, Mode=OneWay}" />
ToolTipService.ToolTip="{x:Bind Commands.NavigateBack.LabelWithHotKey, Mode=OneWay}">
<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateBack.Glyph.BaseGlyph, Mode=OneWay}" />
<Button.ContextFlyout>
<MenuFlyout
x:Name="BackHistoryFlyout"
Expand All @@ -297,13 +297,13 @@
x:Name="Forward"
AccessKey="F"
AccessKeyInvoked="Button_AccessKeyInvoked"
AutomationProperties.FullDescription="{x:Bind ViewModel.Commands.NavigateForward.Description, Mode=OneWay}"
AutomationProperties.Name="{x:Bind ViewModel.Commands.NavigateForward.Label, Mode=OneWay}"
Command="{x:Bind ViewModel.Commands.NavigateForward, Mode=OneWay}"
IsEnabled="{x:Bind ViewModel.Commands.NavigateForward.IsExecutable, Mode=OneWay}"
AutomationProperties.FullDescription="{x:Bind Commands.NavigateForward.Description, Mode=OneWay}"
AutomationProperties.Name="{x:Bind Commands.NavigateForward.Label, Mode=OneWay}"
Command="{x:Bind Commands.NavigateForward, Mode=OneWay}"
IsEnabled="{x:Bind Commands.NavigateForward.IsExecutable, Mode=OneWay}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{x:Bind ViewModel.Commands.NavigateForward.LabelWithHotKey, Mode=OneWay}">
<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.Commands.NavigateForward.Glyph.BaseGlyph, Mode=OneWay}" />
ToolTipService.ToolTip="{x:Bind Commands.NavigateForward.LabelWithHotKey, Mode=OneWay}">
<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateForward.Glyph.BaseGlyph, Mode=OneWay}" />
<Button.ContextFlyout>
<MenuFlyout
x:Name="ForwardHistoryFlyout"
Expand All @@ -327,38 +327,38 @@
x:Name="Up"
AccessKey="U"
AccessKeyInvoked="Button_AccessKeyInvoked"
AutomationProperties.FullDescription="{x:Bind ViewModel.Commands.NavigateUp.Description, Mode=OneWay}"
AutomationProperties.Name="{x:Bind ViewModel.Commands.NavigateUp.Label, Mode=OneWay}"
Command="{x:Bind ViewModel.Commands.NavigateUp, Mode=OneWay}"
IsEnabled="{x:Bind ViewModel.Commands.NavigateUp.IsExecutable, Mode=OneWay}"
AutomationProperties.FullDescription="{x:Bind Commands.NavigateUp.Description, Mode=OneWay}"
AutomationProperties.Name="{x:Bind Commands.NavigateUp.Label, Mode=OneWay}"
Command="{x:Bind Commands.NavigateUp, Mode=OneWay}"
IsEnabled="{x:Bind Commands.NavigateUp.IsExecutable, Mode=OneWay}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{x:Bind ViewModel.Commands.NavigateUp.LabelWithHotKey, Mode=OneWay}">
<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.Commands.NavigateUp.Glyph.BaseGlyph, Mode=OneWay}" />
ToolTipService.ToolTip="{x:Bind Commands.NavigateUp.LabelWithHotKey, Mode=OneWay}">
<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateUp.Glyph.BaseGlyph, Mode=OneWay}" />
</Button>

<Button
x:Name="Refresh"
AccessKey="R"
AccessKeyInvoked="Button_AccessKeyInvoked"
AutomationProperties.Name="{x:Bind Commands.RefreshItems.Label}"
AutomationProperties.Name="{x:Bind Commands.RefreshItems.Label, Mode=OneWay}"
Command="{x:Bind Commands.RefreshItems, Mode=OneWay}"
IsEnabled="{x:Bind Commands.RefreshItems.IsExecutable, Mode=OneWay}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{x:Bind Commands.RefreshItems.LabelWithHotKey, Mode=OneWay}">
<FontIcon FontSize="14" Glyph="{x:Bind Commands.RefreshItems.Glyph.BaseGlyph}" />
<FontIcon FontSize="14" Glyph="{x:Bind Commands.RefreshItems.Glyph.BaseGlyph, Mode=OneWay}" />
</Button>

<Button
x:Name="HomeButton"
x:Load="{x:Bind ViewModel.ShowHomeButton, Mode=OneWay}"
AccessKey="H"
AccessKeyInvoked="Button_AccessKeyInvoked"
AutomationProperties.Name="{x:Bind Commands.NavigateHome.Label}"
AutomationProperties.Name="{x:Bind Commands.NavigateHome.Label, Mode=OneWay}"
Command="{x:Bind Commands.NavigateHome, Mode=OneWay}"
IsEnabled="{x:Bind Commands.NavigateHome.IsExecutable, Mode=OneWay}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{x:Bind Commands.NavigateHome.LabelWithHotKey, Mode=OneWay}">
<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateHome.Glyph.BaseGlyph}" />
<FontIcon FontSize="14" Glyph="{x:Bind Commands.NavigateHome.Glyph.BaseGlyph, Mode=OneWay}" />
</Button>
</StackPanel>

Expand Down Expand Up @@ -478,11 +478,11 @@
x:Name="ShowSearchButton"
AccessKey="I"
AccessKeyInvoked="Button_AccessKeyInvoked"
AutomationProperties.Name="{x:Bind ViewModel.Commands.Search.Label}"
Command="{x:Bind ViewModel.Commands.Search, Mode=OneWay}"
IsEnabled="{x:Bind ViewModel.Commands.Search.IsExecutable}"
AutomationProperties.Name="{x:Bind Commands.Search.Label, Mode=OneWay}"
Command="{x:Bind Commands.Search, Mode=OneWay}"
IsEnabled="{x:Bind Commands.Search.IsExecutable, Mode=OneWay}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{x:Bind ViewModel.Commands.Search.LabelWithHotKey, Mode=OneWay}"
ToolTipService.ToolTip="{x:Bind Commands.Search.LabelWithHotKey, Mode=OneWay}"
Visibility="Collapsed">
<FontIcon FontSize="14" Glyph="{x:Bind ViewModel.SearchButtonGlyph, Mode=OneWay}" />
</Button>
Expand All @@ -495,11 +495,11 @@
Padding="0"
x:Load="{x:Bind ViewModel.ShowShelfPaneToggleButton, Mode=OneWay}"
AccessKeyInvoked="Button_AccessKeyInvoked"
AutomationProperties.Name="{x:Bind ViewModel.Commands.ToggleShelfPane.Label}"
AutomationProperties.Name="{x:Bind Commands.ToggleShelfPane.Label, Mode=OneWay}"
Background="Transparent"
BorderBrush="Transparent"
IsChecked="{x:Bind Commands.ToggleShelfPane.IsOn, Mode=TwoWay}"
ToolTipService.ToolTip="{x:Bind ViewModel.Commands.ToggleShelfPane.LabelWithHotKey, Mode=OneWay}">
ToolTipService.ToolTip="{x:Bind Commands.ToggleShelfPane.LabelWithHotKey, Mode=OneWay}">
<controls:ThemedIcon
Width="16"
Height="16"
Expand Down Expand Up @@ -609,17 +609,16 @@
x:Load="{x:Bind ViewModel.IsAppUpdated, Mode=OneWay}"
AccessKey="2"
AccessKeyInvoked="Button_AccessKeyInvoked"
AutomationProperties.Name="{x:Bind ViewModel.Commands.OpenReleaseNotes.Label}"
Command="{x:Bind ViewModel.Commands.OpenReleaseNotes, Mode=OneWay}"
AutomationProperties.Name="{x:Bind Commands.OpenReleaseNotes.Label, Mode=OneWay}"
Command="{x:Bind Commands.OpenReleaseNotes, Mode=OneWay}"
Style="{StaticResource AddressToolbarButtonStyle}"
ToolTipService.ToolTip="{x:Bind ViewModel.Commands.OpenReleaseNotes.LabelWithHotKey}"
Visibility="{x:Bind ViewModel.Commands.OpenReleaseNotes.IsExecutable, Mode=OneWay}">
ToolTipService.ToolTip="{x:Bind Commands.OpenReleaseNotes.LabelWithHotKey, Mode=OneWay}"
Visibility="{x:Bind Commands.OpenReleaseNotes.IsExecutable, Mode=OneWay}">
<controls:ThemedIcon
Width="16"
Height="16"
Style="{StaticResource App.ThemedIcons.AppUpdatedBox}" />
</Button>

</StackPanel>

<!-- Status Center TeachingTip -->
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/UserControls/Pane/InfoPane.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
x:Name="PreviewErrorText"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Text="{x:Bind GetLocalizedResource('NoItemSelected')}"
Text="{helpers:ResourceString Name=NoItemSelected}"
TextWrapping="WrapWholeWords" />
<ContentPresenter
x:Name="PreviewControlPresenter"
Expand Down Expand Up @@ -505,7 +505,7 @@
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="PreviewErrorText.Visibility" Value="Visible" />
<Setter Target="PreviewErrorText.Text" Value="{x:Bind GetLocalizedResource('DetailsPanePreviewNotAvaliableText')}" />
<Setter Target="PreviewErrorText.Text" Value="{helpers:ResourceString Name=DetailsPanePreviewNotAvaliableText}" />
<Setter Target="FileDetailsRepeater.Visibility" Value="Visible" />
<Setter Target="DetailsTagsList.Visibility" Value="Visible" />
<Setter Target="DetailsOpenProperties.Visibility" Value="Visible" />
Expand All @@ -519,7 +519,7 @@
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="PreviewErrorText.Visibility" Value="Visible" />
<Setter Target="PreviewErrorText.Text" Value="{x:Bind GetLocalizedResource('DetailsPanePreviewNotAvaliableText')}" />
<Setter Target="PreviewErrorText.Text" Value="{helpers:ResourceString Name=DetailsPanePreviewNotAvaliableText}" />
<Setter Target="FileDetailsRepeater.Visibility" Value="Collapsed" />
<Setter Target="DetailsTagsList.Visibility" Value="Collapsed" />
<Setter Target="DetailsOpenProperties.Visibility" Value="Collapsed" />
Expand Down
2 changes: 0 additions & 2 deletions src/Files.App/UserControls/Pane/InfoPane.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ public void UpdatePosition(double panelWidth, double panelHeight)
}
}

private string GetLocalizedResource(string resName) => resName.GetLocalizedResource();

private void Root_Unloaded(object sender, RoutedEventArgs e)
{
PreviewControlPresenter.Content = null;
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/UserControls/SearchBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<AutoSuggestBox
x:Name="SearchRegion"
BorderBrush="{ThemeResource ControlElevationBorderBrush}"
GotFocus="{x:Bind SearchBoxViewModel.SearchRegion_GotFocus}"
GotFocus="SearchRegion_GotFocus"
ItemTemplate="{StaticResource SuggestionTemplate}"
ItemsSource="{x:Bind SearchBoxViewModel.Suggestions, Mode=OneWay}"
KeyDown="SearchRegion_KeyDown"
Expand Down
4 changes: 3 additions & 1 deletion src/Files.App/UserControls/SearchBox.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Files Community
// Licensed under the MIT License.

using Files.App.ViewModels;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;
Expand All @@ -21,6 +20,9 @@ public SearchBoxViewModel SearchBoxViewModel

public SearchBox() => InitializeComponent();

private void SearchRegion_GotFocus(object sender, RoutedEventArgs e)
=> SearchBoxViewModel.SearchRegion_GotFocus(sender, e);

private void SearchRegion_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs e)
=> SearchBoxViewModel.SearchRegion_TextChanged(sender, e);

Expand Down
Loading