Skip to content

Commit 29a65e9

Browse files
authored
Code Quality: Introducing StandardViewBase to reduce code duplication (#10996)
1 parent 42bc72a commit 29a65e9

20 files changed

+343
-625
lines changed

src/Files.App/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<GradientStop Offset="1.0" Color="{ThemeResource ControlStrokeColorDefault}" />
3838
</LinearGradientBrush.GradientStops>
3939
</LinearGradientBrush>
40-
40+
4141
<ResourceDictionary.MergedDictionaries>
4242
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
4343
<ResourceDictionary>

src/Files.App/BaseLayout.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ internal set
248248
}
249249

250250
NotifyPropertyChanged(nameof(SelectedItems));
251-
//ItemManipulationModel.SetDragModeForItems();
252251
}
253252

254253
ParentShellPageInstance!.ToolbarViewModel.SelectedItems = value;

src/Files.App/Dialogs/CreateArchiveDialog.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
Grid.Row="0"
7676
Grid.Column="1"
7777
Width="160"
78+
DisplayMemberPath="Label"
7879
ItemsSource="{x:Bind ViewModel.FileFormats}"
7980
SelectedItem="{x:Bind ViewModel.FileFormat, Mode=TwoWay}"
80-
DisplayMemberPath="Label"
8181
SelectedValuePath="Key" />
8282

8383
<!-- Compression Level -->

src/Files.App/Dialogs/CreateShortcutDialog.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
Title="{helpers:ResourceString Name=NewShortcutDialogTitle}"
99
DefaultButton="Primary"
10-
PrimaryButtonCommand="{x:Bind ViewModel.PrimaryButtonCommand}"
1110
IsPrimaryButtonEnabled="{x:Bind ViewModel.IsLocationValid, Mode=OneWay}"
11+
PrimaryButtonCommand="{x:Bind ViewModel.PrimaryButtonCommand}"
1212
PrimaryButtonText="{helpers:ResourceString Name=Create}"
1313
RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
1414
SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
@@ -29,11 +29,11 @@
2929
<RowDefinition Height="Auto" />
3030
<RowDefinition Height="Auto" />
3131
</Grid.RowDefinitions>
32-
32+
3333
<!-- Header -->
34-
<TextBlock
34+
<TextBlock
3535
Grid.ColumnSpan="2"
36-
Margin="0, 0, 0, 20"
36+
Margin="0,0,0,20"
3737
Text="{helpers:ResourceString Name=NewShortcutDialogDescription}"
3838
TextWrapping="Wrap" />
3939

src/Files.App/UserControls/FilePreviews/CodePreview.xaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
Loaded="UserControl_Loaded"
1212
mc:Ignorable="d">
1313
<Border>
14-
<ScrollViewer
15-
HorizontalScrollBarVisibility="Auto"
16-
HorizontalScrollMode="Auto">
14+
<ScrollViewer HorizontalScrollBarVisibility="Auto" HorizontalScrollMode="Auto">
1715
<RichTextBlock
1816
Name="codeView"
1917
Padding="10"

src/Files.App/UserControls/FilePreviews/MediaPreview.xaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
Foreground="Transparent"
2525
Source="{x:Bind ViewModel.Source, Mode=OneWay}">
2626
<MediaPlayerElement.TransportControls>
27-
<MediaTransportControls
28-
IsPlaybackRateButtonVisible="False"
29-
IsZoomButtonVisible="False" />
27+
<MediaTransportControls IsPlaybackRateButtonVisible="False" IsZoomButtonVisible="False" />
3028
</MediaPlayerElement.TransportControls>
3129
</MediaPlayerElement>
3230
</Border>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@
8989
<StackPanel Orientation="Vertical">
9090
<TextBlock
9191
x:Name="DetailsListHeader"
92+
HorizontalAlignment="Center"
9293
FontSize="20"
9394
FontWeight="Bold"
94-
HorizontalAlignment="Center"
9595
IsTextSelectionEnabled="True"
9696
Text="{x:Bind ViewModel.SelectedItem.Name, Mode=OneWay}"
9797
TextAlignment="Center"

src/Files.App/UserControls/SearchBox.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@
7373

7474
<AutoSuggestBox
7575
x:Name="SearchRegion"
76+
GotFocus="{x:Bind SearchBoxViewModel.SearchRegion_GotFocus}"
7677
ItemTemplate="{StaticResource SuggestionTemplate}"
7778
ItemsSource="{x:Bind SearchBoxViewModel.Suggestions, Mode=OneWay}"
7879
PlaceholderText="{helpers:ResourceString Name=NavigationToolbarSearchRegion/PlaceholderText}"
7980
QuerySubmitted="SearchRegion_QuerySubmitted"
8081
Text="{x:Bind SearchBoxViewModel.Query, Mode=TwoWay}"
8182
TextBoxStyle="{StaticResource TextBoxStyle}"
8283
TextChanged="SearchRegion_TextChanged"
83-
UpdateTextOnSelect="False"
84-
GotFocus="{x:Bind SearchBoxViewModel.SearchRegion_GotFocus}">
84+
UpdateTextOnSelect="False">
8585
<AutoSuggestBox.QueryIcon>
8686
<AnimatedIcon x:Name="SearchAnimatedIcon" Height="16">
8787
<AnimatedIcon.Source>

src/Files.App/UserControls/SidebarControl.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
<ResourceDictionary>
4343
<!-- Removes NavigationView background -->
4444
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
45-
45+
4646
<!-- Removes NavigationView corner radius -->
4747
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
4848

4949
<!-- Removes NavigationView border from top, right and bottom -->
5050
<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
51-
51+
5252
<mconv:BoolNegationConverter x:Key="BoolNegationConverter" />
5353
<mconv:StringFormatConverter x:Key="StringFormatConverter" />
5454
<vc:ColorModelToColorConverter x:Key="ColorModelToColorConverter" />
@@ -420,8 +420,8 @@
420420
<Grid
421421
x:Name="ContentRoot"
422422
Grid.Row="2"
423-
Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}"
424-
Grid.ColumnSpan="2">
423+
Grid.ColumnSpan="2"
424+
Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}">
425425
<Grid.RenderTransform>
426426
<CompositeTransform x:Name="ContentTransform" />
427427
</Grid.RenderTransform>
@@ -1195,6 +1195,6 @@
11951195
DriveNavItemTemplate="{StaticResource DriveNavItem}"
11961196
FileTagNavItemTemplate="{StaticResource FileTagNavItem}"
11971197
LinuxNavItemTemplate="{StaticResource LinuxNavItem}"
1198-
LocationNavItemTemplate="{StaticResource LocationNavItem}"/>
1198+
LocationNavItemTemplate="{StaticResource LocationNavItem}" />
11991199
</NavigationView.MenuItemTemplateSelector>
12001200
</NavigationView>

src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:fs="using:Files.App.Filesystem"
77
xmlns:helpers="using:Files.App.Helpers"
8-
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
98
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
1010
Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
1111
mc:Ignorable="d">
1212

0 commit comments

Comments
 (0)