files-community · yaira2 · Jan 23, 2023 · Jan 13, 2023 · Jan 13, 2023 · Jan 13, 2023
diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml
@@ -37,7 +37,7 @@
 					<GradientStop Offset="1.0" Color="{ThemeResource ControlStrokeColorDefault}" />
 				</LinearGradientBrush.GradientStops>
 			</LinearGradientBrush>
-			
+
 			<ResourceDictionary.MergedDictionaries>
 				<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
 				<ResourceDictionary>

diff --git a/src/Files.App/BaseLayout.cs b/src/Files.App/BaseLayout.cs
@@ -248,7 +248,6 @@ internal set
 					}
 
 					NotifyPropertyChanged(nameof(SelectedItems));
-					//ItemManipulationModel.SetDragModeForItems();
 				}
 
 				ParentShellPageInstance!.ToolbarViewModel.SelectedItems = value;

diff --git a/src/Files.App/Dialogs/CreateArchiveDialog.xaml b/src/Files.App/Dialogs/CreateArchiveDialog.xaml
@@ -75,9 +75,9 @@
 				Grid.Row="0"
 				Grid.Column="1"
 				Width="160"
+				DisplayMemberPath="Label"
 				ItemsSource="{x:Bind ViewModel.FileFormats}"
 				SelectedItem="{x:Bind ViewModel.FileFormat, Mode=TwoWay}"
-				DisplayMemberPath="Label"
 				SelectedValuePath="Key" />
 
 			<!--  Compression Level  -->

diff --git a/src/Files.App/Dialogs/CreateShortcutDialog.xaml b/src/Files.App/Dialogs/CreateShortcutDialog.xaml
@@ -7,8 +7,8 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	Title="{helpers:ResourceString Name=NewShortcutDialogTitle}"
 	DefaultButton="Primary"
-	PrimaryButtonCommand="{x:Bind ViewModel.PrimaryButtonCommand}"
 	IsPrimaryButtonEnabled="{x:Bind ViewModel.IsLocationValid, Mode=OneWay}"
+	PrimaryButtonCommand="{x:Bind ViewModel.PrimaryButtonCommand}"
 	PrimaryButtonText="{helpers:ResourceString Name=Create}"
 	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
@@ -29,11 +29,11 @@
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
-			
+
 			<!--  Header  -->
-			<TextBlock 
+			<TextBlock
 				Grid.ColumnSpan="2"
-				Margin="0, 0, 0, 20"
+				Margin="0,0,0,20"
 				Text="{helpers:ResourceString Name=NewShortcutDialogDescription}"
 				TextWrapping="Wrap" />
 

diff --git a/src/Files.App/UserControls/FilePreviews/CodePreview.xaml b/src/Files.App/UserControls/FilePreviews/CodePreview.xaml
@@ -11,9 +11,7 @@
 	Loaded="UserControl_Loaded"
 	mc:Ignorable="d">
 	<Border>
-		<ScrollViewer
-			HorizontalScrollBarVisibility="Auto"
-			HorizontalScrollMode="Auto">
+		<ScrollViewer HorizontalScrollBarVisibility="Auto" HorizontalScrollMode="Auto">
 			<RichTextBlock
 				Name="codeView"
 				Padding="10"

diff --git a/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml b/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml
@@ -24,9 +24,7 @@
 			Foreground="Transparent"
 			Source="{x:Bind ViewModel.Source, Mode=OneWay}">
 			<MediaPlayerElement.TransportControls>
-				<MediaTransportControls
-					IsPlaybackRateButtonVisible="False"
-					IsZoomButtonVisible="False" />
+				<MediaTransportControls IsPlaybackRateButtonVisible="False" IsZoomButtonVisible="False" />
 			</MediaPlayerElement.TransportControls>
 		</MediaPlayerElement>
 	</Border>

diff --git a/src/Files.App/UserControls/Pane/PreviewPane.xaml b/src/Files.App/UserControls/Pane/PreviewPane.xaml
@@ -89,9 +89,9 @@
 			<StackPanel Orientation="Vertical">
 				<TextBlock
 					x:Name="DetailsListHeader"
+					HorizontalAlignment="Center"
 					FontSize="20"
 					FontWeight="Bold"
-					HorizontalAlignment="Center"
 					IsTextSelectionEnabled="True"
 					Text="{x:Bind ViewModel.SelectedItem.Name, Mode=OneWay}"
 					TextAlignment="Center"

diff --git a/src/Files.App/UserControls/SearchBox.xaml b/src/Files.App/UserControls/SearchBox.xaml
@@ -73,15 +73,15 @@
 
 	<AutoSuggestBox
 		x:Name="SearchRegion"
+		GotFocus="{x:Bind SearchBoxViewModel.SearchRegion_GotFocus}"
 		ItemTemplate="{StaticResource SuggestionTemplate}"
 		ItemsSource="{x:Bind SearchBoxViewModel.Suggestions, Mode=OneWay}"
 		PlaceholderText="{helpers:ResourceString Name=NavigationToolbarSearchRegion/PlaceholderText}"
 		QuerySubmitted="SearchRegion_QuerySubmitted"
 		Text="{x:Bind SearchBoxViewModel.Query, Mode=TwoWay}"
 		TextBoxStyle="{StaticResource TextBoxStyle}"
 		TextChanged="SearchRegion_TextChanged"
-		UpdateTextOnSelect="False"
-		GotFocus="{x:Bind SearchBoxViewModel.SearchRegion_GotFocus}">
+		UpdateTextOnSelect="False">
 		<AutoSuggestBox.QueryIcon>
 			<AnimatedIcon x:Name="SearchAnimatedIcon" Height="16">
 				<AnimatedIcon.Source>

diff --git a/src/Files.App/UserControls/SidebarControl.xaml b/src/Files.App/UserControls/SidebarControl.xaml
@@ -42,13 +42,13 @@
 		<ResourceDictionary>
 			<!--  Removes NavigationView background  -->
 			<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
-			
+
 			<!--  Removes NavigationView corner radius  -->
 			<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0</CornerRadius>
 
 			<!--  Removes NavigationView border from top, right and bottom  -->
 			<Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
-			
+
 			<mconv:BoolNegationConverter x:Key="BoolNegationConverter" />
 			<mconv:StringFormatConverter x:Key="StringFormatConverter" />
 			<vc:ColorModelToColorConverter x:Key="ColorModelToColorConverter" />
@@ -420,8 +420,8 @@
 								<Grid
 									x:Name="ContentRoot"
 									Grid.Row="2"
-									Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}"
-									Grid.ColumnSpan="2">
+									Grid.ColumnSpan="2"
+									Background="{ThemeResource App.Theme.FileArea.BackgroundBrush}">
 									<Grid.RenderTransform>
 										<CompositeTransform x:Name="ContentTransform" />
 									</Grid.RenderTransform>
@@ -1195,6 +1195,6 @@
 			DriveNavItemTemplate="{StaticResource DriveNavItem}"
 			FileTagNavItemTemplate="{StaticResource FileTagNavItem}"
 			LinuxNavItemTemplate="{StaticResource LinuxNavItem}"
-			LocationNavItemTemplate="{StaticResource LocationNavItem}"/>
+			LocationNavItemTemplate="{StaticResource LocationNavItem}" />
 	</NavigationView.MenuItemTemplateSelector>
 </NavigationView>
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml
@@ -5,8 +5,8 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:fs="using:Files.App.Filesystem"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 	Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
 	mc:Ignorable="d">
 

diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
@@ -1,4 +1,4 @@
-<local:BaseLayout
+<local:StandardViewBase
 	x:Class="Files.App.Views.LayoutModes.ColumnViewBase"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -15,7 +15,7 @@
 	xmlns:vc="using:Files.App.ValueConverters"
 	x:Name="PageRoot"
 	mc:Ignorable="d">
-	<local:BaseLayout.Resources>
+	<local:StandardViewBase.Resources>
 		<vc:ColorModelToColorConverter x:Key="ColorModelToColorConverter" />
 		<converters:BoolNegationConverter x:Key="BoolNegationConverter" />
 		<converters:BoolToVisibilityConverter
@@ -120,7 +120,7 @@
 				</Setter.Value>
 			</Setter>
 		</Style>
-	</local:BaseLayout.Resources>
+	</local:StandardViewBase.Resources>
 
 	<Grid x:Name="RootGrid" ContextFlyout="{x:Bind BaseContextMenuFlyout}">
 		<uc:FolderEmptyIndicator
@@ -449,4 +449,4 @@
 				StrokeThickness="1" />
 		</Canvas>
 	</Grid>
-</local:BaseLayout>
+</local:StandardViewBase>
-Original file line number
+Diff line change
@@ Expand Up / @@ -248,7 +248,6 @@ internal set @@
     					}
     					NotifyPropertyChanged(nameof(SelectedItems));
-    					//ItemManipulationModel.SetDragModeForItems();
     				}
     				ParentShellPageInstance!.ToolbarViewModel.SelectedItems = value;
@@ Expand Down @@