CQ: Updates

Author: XTorLukas

src/Files.App/App.xaml.cs

@@ -100,7 +100,9 @@ async Task ActivateAsync()
 				var userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
 				var isLeaveAppRunning = userSettingsService.GeneralSettingsService.LeaveAppRunning;
 
-				Ioc.Default.GetRequiredService<IRealTimeLayoutService>().UpdateCulture(new(AppLanguageHelper.PreferredLanguage.Code));
+				var realTimeLayoutService = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
+				realTimeLayoutService.UpdateCulture(new(AppLanguageHelper.PreferredLanguage.Code));
+
 				MainWindow.Instance.InitializeContentLayout();
 
 				if (isStartupTask && !isLeaveAppRunning)

src/Files.App/Data/Contracts/IRealTimeWindow.cs

@@ -11,11 +11,11 @@ internal interface IRealTimeWindow
 		/// <summary>
 		/// Initializes the content layout for the window.
 		/// </summary>
-		void InitializeContentLayout() { }
+		void InitializeContentLayout();
 
 		/// <summary>
 		/// Updates the content layout of the window.
 		/// </summary>
-		void UpdateContentLayout() { }
+		void UpdateContentLayout();
 	}
 }

src/Files.App/UserControls/Sidebar/SidebarView.xaml.cs

@@ -15,6 +15,10 @@ namespace Files.App.UserControls.Sidebar
 	[ContentProperty(Name = "InnerContent")]
 	public sealed partial class SidebarView : UserControl, INotifyPropertyChanged
 	{
+		private static readonly IRealTimeLayoutService RealTimeLayoutService = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
+
+		private static readonly int RePos = RealTimeLayoutService.FlowDirection == FlowDirection.LeftToRight ? 1 : -1;
+
 		private const double COMPACT_MAX_WIDTH = 200;
 
 		public event EventHandler<object>? ItemInvoked;
@@ -130,10 +134,7 @@ private void SidebarResizer_ManipulationStarted(object sender, ManipulationStart
 
 		private void SidebarResizer_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
 		{
-			var rtls = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
-			var rePos = rtls.FlowDirection == FlowDirection.LeftToRight ? 1 : -1;
-			var newWidth = preManipulationSidebarWidth + (e.Cumulative.Translation.X * rePos);
-
+			var newWidth = preManipulationSidebarWidth + (e.Cumulative.Translation.X * RePos);
 			UpdateDisplayModeForPaneWidth(newWidth);
 			e.Handled = true;
 		}

src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs

@@ -21,7 +21,9 @@ public static class FilePropertiesHelpers
 	{
 		private static IAppThemeModeService AppThemeModeService { get; } = Ioc.Default.GetRequiredService<IAppThemeModeService>();
 
-		private static IRealTimeLayoutService RealTimeLayoutService { get; } = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
+		private static readonly IRealTimeLayoutService RealTimeLayoutService = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
+
+		private static readonly int RePos = RealTimeLayoutService.FlowDirection == FlowDirection.LeftToRight ? 1 : -1;
 
 		/// <summary>
 		/// Get window handle (hWnd) of the given properties window instance
@@ -133,12 +135,11 @@ public static void OpenPropertiesWindow(object item, IShellPage associatedInstan
 
 			// WINUI3: Move window to cursor position
 			PInvoke.GetCursorPos(out var pointerPosition);
-			var rePos = RealTimeLayoutService.FlowDirection is FlowDirection.LeftToRight ? 1 : -1;
 			var displayArea = DisplayArea.GetFromPoint(new PointInt32(pointerPosition.X, pointerPosition.Y), DisplayAreaFallback.Nearest);
 			var appWindowPos = new PointInt32
 			{
 				X = displayArea.WorkArea.X
-					+ Math.Max(0, Math.Min(displayArea.WorkArea.Width - appWindow.Size.Width,( pointerPosition.X * rePos) - displayArea.WorkArea.X)),
+					+ Math.Max(0, Math.Min(displayArea.WorkArea.Width - appWindow.Size.Width,( pointerPosition.X * RePos) - displayArea.WorkArea.X)),
 				Y = displayArea.WorkArea.Y
 					+ Math.Max(0, Math.Min(displayArea.WorkArea.Height - appWindow.Size.Height, pointerPosition.Y - displayArea.WorkArea.Y)),
 			};

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

@@ -18,6 +18,8 @@ public sealed class GeneralViewModel : ObservableObject, IDisposable
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private ICommonDialogService CommonDialogService { get; } = Ioc.Default.GetRequiredService<ICommonDialogService>();
 
+		private static readonly IRealTimeLayoutService RealTimeLayoutService = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
+
 		private bool disposed;
 
 		private ReadOnlyCollection<IMenuFlyoutItemViewModel> addFlyoutItemsSource;
@@ -78,8 +80,7 @@ public int SelectedAppLanguageIndex
 					selectedAppLanguageIndex = value;
 					OnPropertyChanged(nameof(SelectedAppLanguageIndex));
 
-					var RTLayoutService = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
-					RTLayoutService.UpdateCulture(new(AppLanguageHelper.PreferredLanguage.Code));
+					RealTimeLayoutService.UpdateCulture(new(AppLanguageHelper.PreferredLanguage.Code));
 
 					ShowRestartControl = true;
 				}