Rename properties page namespaces and classes (#11460)

0x5bfa · web-flow · commit aead55747efb · 2023-02-26T01:31:28.000-05:00
diff --git a/src/Files.App/Helpers/FilePropertiesHelpers.cs b/src/Files.App/Helpers/FilePropertiesHelpers.cs
@@ -11,7 +11,7 @@
 using Windows.ApplicationModel;
 using Windows.Foundation.Metadata;
 using Windows.Graphics;
-using static Files.App.Views.Properties;
+using static Files.App.Views.Properties.MainPropertiesPage;
 
 namespace Files.App.Helpers
 {
@@ -84,7 +84,7 @@ public static async Task OpenPropertiesWindowAsync(object item, IShellPage assoc
 
 				appWindow.SetIcon(LogoPath);
 
-				if (frame.Content is Properties properties)
+				if (frame.Content is Views.Properties.MainPropertiesPage properties)
 					properties.AppWindow = appWindow;
 
 				appWindow.Show();
@@ -118,7 +118,7 @@ void Navigate(Frame frame)
 					Item = item,
 					AppInstanceArgument = associatedInstance,
 				};
-				frame.Navigate(typeof(Properties), argument, new SuppressNavigationTransitionInfo());
+				frame.Navigate(typeof(Views.Properties.MainPropertiesPage), argument, new SuppressNavigationTransitionInfo());
 			}
 		}
 
diff --git a/src/Files.App/ViewModels/Properties/BasePropertiesPage.cs b/src/Files.App/ViewModels/Properties/BasePropertiesPage.cs
@@ -10,7 +10,7 @@
 
 namespace Files.App.ViewModels.Properties
 {
-	public abstract class PropertiesTab : Page, IDisposable
+	public abstract class BasePropertiesPage : Page, IDisposable
 	{
 		public IShellPage AppInstance = null;
 
@@ -28,7 +28,7 @@ protected virtual void Properties_Loaded(object sender, RoutedEventArgs e)
 
 		protected override void OnNavigatedTo(NavigationEventArgs e)
 		{
-			var np = e.Parameter as Views.Properties.PropertyNavParam;
+			var np = e.Parameter as Views.Properties.MainPropertiesPage.PropertyNavParam;
 
 			AppInstance = np.AppInstanceArgument;
 			ViewModel = new SelectedItemsPropertiesViewModel();
diff --git a/src/Files.App/ViewModels/Properties/CompatibilityViewModel.cs b/src/Files.App/ViewModels/Properties/CompatibilityViewModel.cs
@@ -11,7 +11,7 @@
 
 namespace Files.App.ViewModels.Properties
 {
-	public class CompatibilityProperties : ObservableObject
+	public class CompatibilityViewModel : ObservableObject
 	{
 		public ListedItem Item { get; }
 
@@ -149,7 +149,7 @@ public LocalizedEnumHelper<HighDpiOverride> HighDpiOverride
 
 		public IRelayCommand RunTroubleshooterCommand { get; set; }
 
-		public CompatibilityProperties(ListedItem item)
+		public CompatibilityViewModel(ListedItem item)
 		{
 			Item = item;
 
diff --git a/src/Files.App/ViewModels/Properties/SecurityViewModel.cs b/src/Files.App/ViewModels/Properties/SecurityViewModel.cs
@@ -12,11 +12,11 @@
 
 namespace Files.App.ViewModels.Properties
 {
-	public class SecurityProperties : ObservableObject
+	public class SecurityViewModel : ObservableObject
 	{
 		public ListedItem Item { get; }
 
-		public SecurityProperties(ListedItem item)
+		public SecurityViewModel(ListedItem item)
 		{
 			Item = item;
 
@@ -25,7 +25,7 @@ public SecurityProperties(ListedItem item)
 			InitCommands();
 		}
 
-		public SecurityProperties(DriveItem item)
+		public SecurityViewModel(DriveItem item)
 		{
 			Item = new ListedItem()
 			{
diff --git a/src/Files.App/Views/Properties/CompatibilityPage.xaml b/src/Files.App/Views/Properties/CompatibilityPage.xaml
@@ -1,5 +1,5 @@
-﻿<vm:PropertiesTab
-	x:Class="Files.App.Views.PropertiesCompatibility"
+﻿<vm:BasePropertiesPage
+	x:Class="Files.App.Views.Properties.CompatibilityPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:converters="using:Files.App.Converters"
@@ -11,7 +11,7 @@
 	Loaded="Properties_Loaded"
 	mc:Ignorable="d">
 
-	<vm:PropertiesTab.Resources>
+	<vm:BasePropertiesPage.Resources>
 		<ResourceDictionary>
 
 			<ResourceDictionary.MergedDictionaries>
@@ -22,7 +22,7 @@
 			<converters:NullToTrueConverter x:Key="NullToFalseConverter" Inverse="True" />
 
 		</ResourceDictionary>
-	</vm:PropertiesTab.Resources>
+	</vm:BasePropertiesPage.Resources>
 
 	<ScrollViewer>
 		<StackPanel Padding="12" Spacing="4">
@@ -107,4 +107,4 @@
 
 		</StackPanel>
 	</ScrollViewer>
-</vm:PropertiesTab>
+</vm:BasePropertiesPage>
diff --git a/src/Files.App/Views/Properties/CompatibilityPage.xaml.cs b/src/Files.App/Views/Properties/CompatibilityPage.xaml.cs
@@ -4,24 +4,24 @@
 using Microsoft.UI.Xaml.Navigation;
 using System.Threading.Tasks;
 
-namespace Files.App.Views
+namespace Files.App.Views.Properties
 {
-	public sealed partial class PropertiesCompatibility : PropertiesTab
+	public sealed partial class CompatibilityPage : BasePropertiesPage
 	{
-		public CompatibilityProperties CompatibilityProperties { get; set; }
+		public CompatibilityViewModel CompatibilityProperties { get; set; }
 
-		public PropertiesCompatibility()
+		public CompatibilityPage()
 		{
 			InitializeComponent();
 		}
 
 		protected override void OnNavigatedTo(NavigationEventArgs e)
 		{
-			var np = e.Parameter as Views.Properties.PropertyNavParam;
+			var np = e.Parameter as Views.Properties.MainPropertiesPage.PropertyNavParam;
 
 			if (np.navParameter is ListedItem listedItem)
 			{
-				CompatibilityProperties = new CompatibilityProperties(listedItem);
+				CompatibilityProperties = new CompatibilityViewModel(listedItem);
 			}
 
 			base.OnNavigatedTo(e);
diff --git a/src/Files.App/Views/Properties/CustomizationPage.xaml b/src/Files.App/Views/Properties/CustomizationPage.xaml
@@ -1,5 +1,5 @@
-﻿<vm:PropertiesTab
-	x:Class="Files.App.Views.PropertiesCustomization"
+﻿<vm:BasePropertiesPage
+	x:Class="Files.App.Views.Properties.CustomizationPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -12,7 +12,7 @@
 	DataContext="{x:Bind CustomizationViewModel, Mode=OneWay}"
 	mc:Ignorable="d">
 
-	<vm:PropertiesTab.Resources>
+	<vm:BasePropertiesPage.Resources>
 		<ResourceDictionary>
 
 			<ResourceDictionary.MergedDictionaries>
@@ -22,7 +22,7 @@
 			<toolkitconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
 
 		</ResourceDictionary>
-	</vm:PropertiesTab.Resources>
+	</vm:BasePropertiesPage.Resources>
 
 	<Grid Padding="12">
 
@@ -125,4 +125,4 @@
 		</Grid>
 
 	</Grid>
-</vm:PropertiesTab>
+</vm:BasePropertiesPage>
diff --git a/src/Files.App/Views/Properties/CustomizationPage.xaml.cs b/src/Files.App/Views/Properties/CustomizationPage.xaml.cs
@@ -8,13 +8,13 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Files.App.Views
+namespace Files.App.Views.Properties
 {
-	public sealed partial class PropertiesCustomization : PropertiesTab
+	public sealed partial class CustomizationPage : BasePropertiesPage
 	{
 		private CustomizationViewModel CustomizationViewModel { get; set; }
 
-		public PropertiesCustomization()
+		public CustomizationPage()
 		{
 			InitializeComponent();
 		}
@@ -44,7 +44,7 @@ private async void PickDllButton_Click(object sender, RoutedEventArgs e)
 			picker.FileTypeFilter.Add(".ico");
 
 			// WINUI3: Create and initialize new window
-			var parentWindowId = ((Properties)((Frame)XamlRoot.Content).Content).AppWindow.Id;
+			var parentWindowId = ((Views.Properties.MainPropertiesPage)((Frame)XamlRoot.Content).Content).AppWindow.Id;
 			var handle = Microsoft.UI.Win32Interop.GetWindowFromWindowId(parentWindowId);
 			WinRT.Interop.InitializeWithWindow.Initialize(picker, handle);
 
diff --git a/src/Files.App/Views/Properties/DetailsPage.xaml b/src/Files.App/Views/Properties/DetailsPage.xaml
@@ -1,5 +1,5 @@
-﻿<vm:PropertiesTab
-	x:Class="Files.App.Views.PropertiesDetails"
+﻿<vm:BasePropertiesPage
+	x:Class="Files.App.Views.Properties.DetailsPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -109,4 +109,4 @@
 
 		</Grid>
 	</ScrollViewer>
-</vm:PropertiesTab>
+</vm:BasePropertiesPage>
diff --git a/src/Files.App/Views/Properties/DetailsPage.xaml.cs b/src/Files.App/Views/Properties/DetailsPage.xaml.cs
@@ -7,11 +7,11 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 
-namespace Files.App.Views
+namespace Files.App.Views.Properties
 {
-	public sealed partial class PropertiesDetails : PropertiesTab
+	public sealed partial class DetailsPage : BasePropertiesPage
 	{
-		public PropertiesDetails()
+		public DetailsPage()
 		{
 			InitializeComponent();
 		}
diff --git a/src/Files.App/Views/Properties/GeneralPage.xaml b/src/Files.App/Views/Properties/GeneralPage.xaml
@@ -1,5 +1,5 @@
-﻿<vm:PropertiesTab
-	x:Class="Files.App.Views.PropertiesGeneral"
+﻿<vm:BasePropertiesPage
+	x:Class="Files.App.Views.Properties.GeneralPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -11,7 +11,7 @@
 	Loaded="Properties_Loaded"
 	mc:Ignorable="d">
 
-	<vm:PropertiesTab.Resources>
+	<vm:BasePropertiesPage.Resources>
 		<ResourceDictionary>
 
 			<ResourceDictionary.MergedDictionaries>
@@ -33,7 +33,7 @@
 			<toolkitconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
 
 		</ResourceDictionary>
-	</vm:PropertiesTab.Resources>
+	</vm:BasePropertiesPage.Resources>
 
 	<ScrollViewer>
 		<StackPanel
@@ -569,4 +569,4 @@
 
 		</StackPanel>
 	</ScrollViewer>
-</vm:PropertiesTab>
+</vm:BasePropertiesPage>
diff --git a/src/Files.App/Views/Properties/GeneralPage.xaml.cs b/src/Files.App/Views/Properties/GeneralPage.xaml.cs
@@ -14,13 +14,13 @@
 using System.Threading.Tasks;
 using Windows.Storage;
 
-namespace Files.App.Views
+namespace Files.App.Views.Properties
 {
-	public sealed partial class PropertiesGeneral : PropertiesTab
+	public sealed partial class GeneralPage : BasePropertiesPage
 	{
 		private readonly Regex letterRegex = new(@"\s*\(\w:\)$");
 
-		public PropertiesGeneral() => InitializeComponent();
+		public GeneralPage() => InitializeComponent();
 
 		public override async Task<bool> SaveChangesAsync()
 		{
diff --git a/src/Files.App/Views/Properties/LibraryPage.xaml b/src/Files.App/Views/Properties/LibraryPage.xaml
@@ -1,9 +1,10 @@
-﻿<vm:PropertiesTab
-	x:Class="Files.App.Views.PropertiesLibrary"
+﻿<vm:BasePropertiesPage
+	x:Class="Files.App.Views.Properties.LibraryPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
+	xmlns:local="using:Files.App.Views.Properties"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
 	xmlns:vm="using:Files.App.ViewModels.Properties"
@@ -95,7 +96,7 @@
 					SelectionMode="Single">
 
 					<ListView.ItemTemplate>
-						<DataTemplate xmlns:vm="using:Files.App.Views" x:DataType="vm:LibraryFolder">
+						<DataTemplate x:DataType="local:LibraryFolder">
 							<Grid>
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="36" />
@@ -134,4 +135,4 @@
 
 		</StackPanel>
 	</ScrollViewer>
-</vm:PropertiesTab>
+</vm:BasePropertiesPage>
diff --git a/src/Files.App/Views/Properties/LibraryPage.xaml.cs b/src/Files.App/Views/Properties/LibraryPage.xaml.cs
@@ -15,9 +15,9 @@
 using System.Windows.Input;
 using Windows.Storage.Pickers;
 
-namespace Files.App.Views
+namespace Files.App.Views.Properties
 {
-	public sealed partial class PropertiesLibrary : PropertiesTab, INotifyPropertyChanged
+	public sealed partial class LibraryPage : BasePropertiesPage, INotifyPropertyChanged
 	{
 		public event PropertyChangedEventHandler PropertyChanged;
 
@@ -66,7 +66,7 @@ public bool IsPinned
 		public ICommand SetDefaultLocationCommand { get; }
 		public ICommand RemoveLocationCommand { get; }
 
-		public PropertiesLibrary()
+		public LibraryPage()
 		{
 			InitializeComponent();
 
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml b/src/Files.App/Views/Properties/MainPropertiesPage.xaml
@@ -1,11 +1,11 @@
 ﻿<Page
-	x:Class="Files.App.Views.Properties"
+	x:Class="Files.App.Views.Properties.MainPropertiesPage"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:convers="using:Files.App.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.Views"
+	xmlns:local="using:Files.App.Views.Properties"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:toolkitconvers="using:CommunityToolkit.WinUI.UI.Converters"
 	Background="{ThemeResource App.Theme.BackgroundBrush}"
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
diff --git a/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml b/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml
diff --git a/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml.cs b/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml.cs
diff --git a/src/Files.App/Views/Properties/SecurityPage.xaml b/src/Files.App/Views/Properties/SecurityPage.xaml
diff --git a/src/Files.App/Views/Properties/SecurityPage.xaml.cs b/src/Files.App/Views/Properties/SecurityPage.xaml.cs
diff --git a/src/Files.App/Views/Properties/ShortcutPage.xaml b/src/Files.App/Views/Properties/ShortcutPage.xaml
diff --git a/src/Files.App/Views/Properties/ShortcutPage.xaml.cs b/src/Files.App/Views/Properties/ShortcutPage.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace Files.App.ViewModels.Properties`
`12`	`12`	`{`
`13`		`- public abstract class PropertiesTab : Page, IDisposable`
	`13`	`+ public abstract class BasePropertiesPage : Page, IDisposable`
`14`	`14`	`{`
`15`	`15`	`public IShellPage AppInstance = null;`
`16`	`16`
`@@ -28,7 +28,7 @@ protected virtual void Properties_Loaded(object sender, RoutedEventArgs e)`
`28`	`28`
`29`	`29`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`30`	`30`	`{`
`31`		`- var np = e.Parameter as Views.Properties.PropertyNavParam;`
	`31`	`+ var np = e.Parameter as Views.Properties.MainPropertiesPage.PropertyNavParam;`
`32`	`32`
`33`	`33`	`AppInstance = np.AppInstanceArgument;`
`34`	`34`	`ViewModel = new SelectedItemsPropertiesViewModel();`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Files.App.ViewModels.Properties`
`13`	`13`	`{`
`14`		`- public class CompatibilityProperties : ObservableObject`
	`14`	`+ public class CompatibilityViewModel : ObservableObject`
`15`	`15`	`{`
`16`	`16`	`public ListedItem Item { get; }`
`17`	`17`
`@@ -149,7 +149,7 @@ public LocalizedEnumHelper<HighDpiOverride> HighDpiOverride`
`149`	`149`
`150`	`150`	`public IRelayCommand RunTroubleshooterCommand { get; set; }`
`151`	`151`
`152`		`- public CompatibilityProperties(ListedItem item)`
	`152`	`+ public CompatibilityViewModel(ListedItem item)`
`153`	`153`	`{`
`154`	`154`	`Item = item;`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`
`13`	`13`	`namespace Files.App.ViewModels.Properties`
`14`	`14`	`{`
`15`		`- public class SecurityProperties : ObservableObject`
	`15`	`+ public class SecurityViewModel : ObservableObject`
`16`	`16`	`{`
`17`	`17`	`public ListedItem Item { get; }`
`18`	`18`
`19`		`- public SecurityProperties(ListedItem item)`
	`19`	`+ public SecurityViewModel(ListedItem item)`
`20`	`20`	`{`
`21`	`21`	`Item = item;`
`22`	`22`
`@@ -25,7 +25,7 @@ public SecurityProperties(ListedItem item)`
`25`	`25`	`InitCommands();`
`26`	`26`	`}`
`27`	`27`
`28`		`- public SecurityProperties(DriveItem item)`
	`28`	`+ public SecurityViewModel(DriveItem item)`
`29`	`29`	`{`
`30`	`30`	`Item = new ListedItem()`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,24 +4,24 @@`
`4`	`4`	`using Microsoft.UI.Xaml.Navigation;`
`5`	`5`	`using System.Threading.Tasks;`
`6`	`6`
`7`		`-namespace Files.App.Views`
	`7`	`+namespace Files.App.Views.Properties`
`8`	`8`	`{`
`9`		`- public sealed partial class PropertiesCompatibility : PropertiesTab`
	`9`	`+ public sealed partial class CompatibilityPage : BasePropertiesPage`
`10`	`10`	`{`
`11`		`- public CompatibilityProperties CompatibilityProperties { get; set; }`
	`11`	`+ public CompatibilityViewModel CompatibilityProperties { get; set; }`
`12`	`12`
`13`		`- public PropertiesCompatibility()`
	`13`	`+ public CompatibilityPage()`
`14`	`14`	`{`
`15`	`15`	`InitializeComponent();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`19`	`19`	`{`
`20`		`- var np = e.Parameter as Views.Properties.PropertyNavParam;`
	`20`	`+ var np = e.Parameter as Views.Properties.MainPropertiesPage.PropertyNavParam;`
`21`	`21`
`22`	`22`	`if (np.navParameter is ListedItem listedItem)`
`23`	`23`	`{`
`24`		`- CompatibilityProperties = new CompatibilityProperties(listedItem);`
	`24`	`+ CompatibilityProperties = new CompatibilityViewModel(listedItem);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`base.OnNavigatedTo(e);`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@`
`8`	`8`	`using System.IO;`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`
`11`		`-namespace Files.App.Views`
	`11`	`+namespace Files.App.Views.Properties`
`12`	`12`	`{`
`13`		`- public sealed partial class PropertiesCustomization : PropertiesTab`
	`13`	`+ public sealed partial class CustomizationPage : BasePropertiesPage`
`14`	`14`	`{`
`15`	`15`	`private CustomizationViewModel CustomizationViewModel { get; set; }`
`16`	`16`
`17`		`- public PropertiesCustomization()`
	`17`	`+ public CustomizationPage()`
`18`	`18`	`{`
`19`	`19`	`InitializeComponent();`
`20`	`20`	`}`
`@@ -44,7 +44,7 @@ private async void PickDllButton_Click(object sender, RoutedEventArgs e)`
`44`	`44`	`picker.FileTypeFilter.Add(".ico");`
`45`	`45`
`46`	`46`	`// WINUI3: Create and initialize new window`
`47`		`- var parentWindowId = ((Properties)((Frame)XamlRoot.Content).Content).AppWindow.Id;`
	`47`	`+ var parentWindowId = ((Views.Properties.MainPropertiesPage)((Frame)XamlRoot.Content).Content).AppWindow.Id;`
`48`	`48`	`var handle = Microsoft.UI.Win32Interop.GetWindowFromWindowId(parentWindowId);`
`49`	`49`	`WinRT.Interop.InitializeWithWindow.Initialize(picker, handle);`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@`
`7`	`7`	`using System.Diagnostics;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`
`10`		`-namespace Files.App.Views`
	`10`	`+namespace Files.App.Views.Properties`
`11`	`11`	`{`
`12`		`- public sealed partial class PropertiesDetails : PropertiesTab`
	`12`	`+ public sealed partial class DetailsPage : BasePropertiesPage`
`13`	`13`	`{`
`14`		`- public PropertiesDetails()`
	`14`	`+ public DetailsPage()`
`15`	`15`	`{`
`16`	`16`	`InitializeComponent();`
`17`	`17`	`}`