Update BaseLayoutPage.cs

Author: yaira2

src/Files.App/Views/Layouts/BaseLayoutPage.cs

@@ -42,6 +42,8 @@ public abstract class BaseLayoutPage : Page, IBaseLayoutPage, INotifyPropertyCha
 		protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetService<IFileTagsSettingsService>()!;
 		protected IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>()!;
 		protected ILayoutSettingsService LayoutSettingsService { get; } = Ioc.Default.GetService<ILayoutSettingsService>()!;
+		protected IGeneralSettingsService GeneralSettingsService { get; } = Ioc.Default.GetService<IGeneralSettingsService>()!;
+		protected IFoldersSettingsService FoldersSettingsService { get; } = Ioc.Default.GetService<IFoldersSettingsService>()!;
 		protected ICommandManager Commands { get; } = Ioc.Default.GetRequiredService<ICommandManager>();
 		public InfoPaneViewModel InfoPaneViewModel { get; } = Ioc.Default.GetRequiredService<InfoPaneViewModel>();
 		protected readonly IWindowContext WindowContext = Ioc.Default.GetRequiredService<IWindowContext>();
@@ -1008,8 +1010,8 @@ protected virtual void Page_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 			bool isShiftDown = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
 
 			// OEM codes
-			bool isOemMinus = (int)key == 189;
-			bool isOemPeriod = (int)key == 190;
+			bool isOemMinus = (int)key == (int)Keys.OemMinus;
+			bool isOemPeriod = (int)key == (int)Keys.OemPeriod;
 
 			char? keyChar = key switch
 			{
@@ -1024,28 +1026,28 @@ protected virtual void Page_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 			{
 				string typedChar = char.ToLowerInvariant(ch).ToString();
 
-				if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+				if (FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
 				{
-					if (!UserSettingsService.GeneralSettingsService.ShowFilterHeader)
-						UserSettingsService.GeneralSettingsService.ShowFilterHeader = true;
+					if (!GeneralSettingsService.ShowFilterHeader)
+						GeneralSettingsService.ShowFilterHeader = true;
 
 					ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += typedChar;
 				}
 
 				JumpString += typedChar;
 			}
 			else if (key == VirtualKey.Space && !string.IsNullOrEmpty(filter) &&
-					 UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+					 FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
 			{
 				ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += " ";
 			}
 			else if (key == VirtualKey.Back && !string.IsNullOrEmpty(filter) &&
-					 UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+					 FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
 			{
 				ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter = filter[..^1];
 
 				if (string.IsNullOrEmpty(ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter))
-					UserSettingsService.GeneralSettingsService.ShowFilterHeader = false;
+					GeneralSettingsService.ShowFilterHeader = false;
 			}
 
 			if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)