Feature: Renamed Preferences to General

src/Files.App/App.xaml.cs

@@ -187,7 +187,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
 					services
 						.AddSingleton<IUserSettingsService, UserSettingsService>()
 						.AddSingleton<IAppearanceSettingsService, AppearanceSettingsService>((sp) => new AppearanceSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
-						.AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>((sp) => new PreferencesSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
+						.AddSingleton<IGeneralSettingsService, GeneralSettingsService>((sp) => new GeneralSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 						.AddSingleton<IFoldersSettingsService, FoldersSettingsService>((sp) => new FoldersSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 						.AddSingleton<IApplicationSettingsService, ApplicationSettingsService>((sp) => new ApplicationSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
 						.AddSingleton<IPreviewPaneSettingsService, PreviewPaneSettingsService>((sp) => new PreviewPaneSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))

src/Files.App/Dialogs/SettingsDialog.xaml

@@ -72,22 +72,22 @@
 			<!--  Menu Items  -->
 			<NavigationView.MenuItems>
 				<NavigationViewItem
-					AccessKey="A"
-					AutomationProperties.AutomationId="SettingsItemAppearance"
-					Content="{helpers:ResourceString Name=Appearance}"
+					AccessKey="P"
+					AutomationProperties.AutomationId="SettingsItemPreferences"
+					Content="{helpers:ResourceString Name=General}"
 					IsSelected="True"
 					Tag="0">
 					<NavigationViewItem.Icon>
-						<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
+						<FontIcon Glyph="&#xE9E9;" />
 					</NavigationViewItem.Icon>
 				</NavigationViewItem>
 				<NavigationViewItem
-					AccessKey="P"
-					AutomationProperties.AutomationId="SettingsItemPreferences"
-					Content="{helpers:ResourceString Name=SettingsNavPreferences/Content}"
+					AccessKey="A"
+					AutomationProperties.AutomationId="SettingsItemAppearance"
+					Content="{helpers:ResourceString Name=Appearance}"
 					Tag="1">
 					<NavigationViewItem.Icon>
-						<FontIcon Glyph="&#xE9E9;" />
+						<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
 					</NavigationViewItem.Icon>
 				</NavigationViewItem>
 				<NavigationViewItem

src/Files.App/Dialogs/SettingsDialog.xaml.cs

@@ -45,8 +45,8 @@ private void MainSettingsNavigationView_SelectionChanged(NavigationView sender,
 
 			_ = selectedItemTag switch
 			{
-				0 => SettingsContentFrame.Navigate(typeof(AppearancePage)),
-				1 => SettingsContentFrame.Navigate(typeof(PreferencesPage)),
+				0 => SettingsContentFrame.Navigate(typeof(GeneralPage)),
+				1 => SettingsContentFrame.Navigate(typeof(AppearancePage)),
 				2 => SettingsContentFrame.Navigate(typeof(FoldersPage)),
 				3 => SettingsContentFrame.Navigate(typeof(TagsPage)),
 				4 => SettingsContentFrame.Navigate(typeof(AdvancedPage)),

src/Files.App/Helpers/WidgetsHelpers.cs

@@ -7,7 +7,7 @@ namespace Files.App.Helpers
 {
 	public static class WidgetsHelpers
 	{
-		public static TWidget? TryGetWidget<TWidget>(IPreferencesSettingsService preferencesSettingsService, WidgetsListControlViewModel widgetsViewModel, out bool shouldReload, TWidget? defaultValue = default) where TWidget : IWidgetItemModel, new()
+		public static TWidget? TryGetWidget<TWidget>(IGeneralSettingsService preferencesSettingsService, WidgetsListControlViewModel widgetsViewModel, out bool shouldReload, TWidget? defaultValue = default) where TWidget : IWidgetItemModel, new()
 		{
 			bool canAddWidget = widgetsViewModel.CanAddWidget(typeof(TWidget).Name);
 			bool isWidgetSettingEnabled = TryGetIsWidgetSettingEnabled<TWidget>(preferencesSettingsService);
@@ -35,7 +35,7 @@ public static class WidgetsHelpers
 			return (defaultValue);
 		}
 
-		public static bool TryGetIsWidgetSettingEnabled<TWidget>(IPreferencesSettingsService preferencesSettingsService) where TWidget : IWidgetItemModel
+		public static bool TryGetIsWidgetSettingEnabled<TWidget>(IGeneralSettingsService preferencesSettingsService) where TWidget : IWidgetItemModel
 		{
 			if (typeof(TWidget) == typeof(QuickAccessWidget))
 			{

src/Files.App/ServicesImplementation/Settings/PreferencesSettingsService.cs → src/Files.App/ServicesImplementation/Settings/GeneralSettingsService.cs

@@ -7,9 +7,9 @@
 
 namespace Files.App.ServicesImplementation.Settings
 {
-	internal sealed class PreferencesSettingsService : BaseObservableJsonSettings, IPreferencesSettingsService
+	internal sealed class GeneralSettingsService : BaseObservableJsonSettings, IGeneralSettingsService
 	{
-		public PreferencesSettingsService(ISettingsSharingContext settingsSharingContext)
+		public GeneralSettingsService(ISettingsSharingContext settingsSharingContext)
 		{
 			// Register root
 			RegisterSettingsContext(settingsSharingContext);

src/Files.App/ServicesImplementation/Settings/UserSettingsService.cs

@@ -12,8 +12,8 @@ namespace Files.App.ServicesImplementation.Settings
 {
 	internal sealed class UserSettingsService : BaseJsonSettings, IUserSettingsService
 	{
-		private IPreferencesSettingsService _PreferencesSettingsService;
-		public IPreferencesSettingsService PreferencesSettingsService
+		private IGeneralSettingsService _PreferencesSettingsService;
+		public IGeneralSettingsService PreferencesSettingsService
 		{
 			get => GetSettingsService(ref _PreferencesSettingsService);
 		}

src/Files.App/Strings/en-US/Resources.resw

@@ -216,9 +216,6 @@
   <data name="Advanced" xml:space="preserve">
     <value>Advanced</value>
   </data>
-  <data name="SettingsNavPreferences.Content" xml:space="preserve">
-    <value>Preferences</value>
-  </data>
   <data name="SettingsOnStartupContinueWhereYouLeftOff.Content" xml:space="preserve">
     <value>Continue where you left off</value>
   </data>

src/Files.App/ViewModels/Previews/FolderPreviewViewModel.cs

@@ -15,7 +15,7 @@ namespace Files.App.ViewModels.Previews
 {
 	public class FolderPreviewViewModel
 	{
-		private readonly IPreferencesSettingsService preferencesSettingsService = Ioc.Default.GetService<IPreferencesSettingsService>();
+		private readonly IGeneralSettingsService preferencesSettingsService = Ioc.Default.GetService<IGeneralSettingsService>();
 
 		private static readonly IDateTimeFormatter dateTimeFormatter = Ioc.Default.GetService<IDateTimeFormatter>();
 

src/Files.App/ViewModels/Settings/PreferencesViewModel.cs → src/Files.App/ViewModels/Settings/GeneralViewModel.cs

@@ -23,7 +23,7 @@
 
 namespace Files.App.ViewModels.Settings
 {
-	public class PreferencesViewModel : ObservableObject, IDisposable
+	public class GeneralViewModel : ObservableObject, IDisposable
 	{
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
@@ -97,7 +97,7 @@ public int SelectedAppLanguageIndex
 
 		public ObservableCollection<AppLanguageItem> AppLanguages { get; set; }
 
-		public PreferencesViewModel()
+		public GeneralViewModel()
 		{
 			OpenFilesAtStartupCommand = new AsyncRelayCommand(OpenFilesAtStartup);
 			ChangePageCommand = new AsyncRelayCommand(ChangePage);
@@ -590,7 +590,7 @@ public void Dispose()
 			}
 		}
 
-		~PreferencesViewModel()
+		~GeneralViewModel()
 		{
 			Dispose();
 		}

src/Files.App/Views/Settings/PreferencesPage.xaml → src/Files.App/Views/Settings/GeneralPage.xaml

@@ -1,5 +1,5 @@
 <Page
-	x:Class="Files.App.Views.Settings.PreferencesPage"
+	x:Class="Files.App.Views.Settings.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"
@@ -17,7 +17,7 @@
 	</Page.Resources>
 
 	<Page.DataContext>
-		<vm:PreferencesViewModel x:Name="ViewModel" />
+		<vm:GeneralViewModel x:Name="ViewModel" />
 	</Page.DataContext>
 
 	<Grid>

src/Files.App/Views/Settings/PreferencesPage.xaml.cs → src/Files.App/Views/Settings/GeneralPage.xaml.cs

@@ -2,9 +2,9 @@
 
 namespace Files.App.Views.Settings
 {
-	public sealed partial class PreferencesPage : Page
+	public sealed partial class GeneralPage : Page
 	{
-		public PreferencesPage()
+		public GeneralPage()
 		{
 			InitializeComponent();
 		}

src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs → src/Files.Backend/Services/Settings/IGeneralSettingsService.cs

@@ -4,7 +4,7 @@
 
 namespace Files.Backend.Services.Settings
 {
-	public interface IPreferencesSettingsService : IBaseSettingsService, INotifyPropertyChanged
+	public interface IGeneralSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to search unindexed items.

src/Files.Backend/Services/Settings/IUserSettingsService.cs

@@ -11,7 +11,7 @@ public interface IUserSettingsService : IBaseSettingsService
 
 		object ExportSettings();
 
-		IPreferencesSettingsService PreferencesSettingsService { get; }
+		IGeneralSettingsService PreferencesSettingsService { get; }
 
 		IFoldersSettingsService FoldersSettingsService { get; }