From c873d88620bb4ba04e335164c705a3a20e6d7830 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sun, 4 May 2025 15:27:04 -0400
Subject: [PATCH 1/2] Code Quality: Improved visual states for properties nav

---
 .../Views/Properties/MainPropertiesPage.xaml    | 14 ++++++++++++++
 .../Views/Properties/MainPropertiesPage.xaml.cs | 17 ++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml b/src/Files.App/Views/Properties/MainPropertiesPage.xaml
index 8df9aea7d607..6e9130c4f7ce 100644
--- a/src/Files.App/Views/Properties/MainPropertiesPage.xaml
+++ b/src/Files.App/Views/Properties/MainPropertiesPage.xaml
@@ -191,5 +191,19 @@
 
 		</NavigationView>
 
+		<VisualStateManager.VisualStateGroups>
+			<VisualStateGroup x:Name="NavigationStates">
+				<VisualState x:Name="Narrow">
+					<VisualState.Setters>
+						<Setter Target="MainPropertiesWindowNavigationView.PaneDisplayMode" Value="LeftCompact" />
+					</VisualState.Setters>
+				</VisualState>
+				<VisualState x:Name="Wide">
+					<VisualState.Setters>
+						<Setter Target="MainPropertiesWindowNavigationView.PaneDisplayMode" Value="Left" />
+					</VisualState.Setters>
+				</VisualState>
+			</VisualStateGroup>
+		</VisualStateManager.VisualStateGroups>
 	</Grid>
 </vm:BasePropertiesPage>
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
index 5ec86eb0bdcc..5f568fb9ecb6 100644
--- a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
+++ b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
@@ -62,7 +62,7 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
 			Window.Closed += Window_Closed;
 
 			AppThemeModeService.ApplyResources();
-			UpdatePageLayout();
+			UpdatePageLayout(this.Width);
 			Window.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
 			Window.AppWindow.Changed += AppWindow_Changed;
 		}
@@ -74,7 +74,7 @@ private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32
 		}
 
 		private void Page_SizeChanged(object sender, SizeChangedEventArgs e)
-			=> UpdatePageLayout();
+			=> UpdatePageLayout(e.NewSize.Width);
 
 		private void Page_KeyDown(object sender, KeyRoutedEventArgs e)
 		{
@@ -82,16 +82,15 @@ private void Page_KeyDown(object sender, KeyRoutedEventArgs e)
 				Window.Close();
 		}
 
-		private void UpdatePageLayout()
+		private void UpdatePageLayout(double pageWidth)
 		{
-			// NavigationView Pane Mode
-			MainPropertiesWindowNavigationView.PaneDisplayMode =
-				ActualWidth <= 600
-					? NavigationViewPaneDisplayMode.LeftCompact
-					: NavigationViewPaneDisplayMode.Left;
+			if (pageWidth < 600)
+				VisualStateManager.GoToState(this, "Narrow", true);
+			else
+				VisualStateManager.GoToState(this, "Wide", true);
 
 			// Collapse NavigationViewItem Content text
-			if (ActualWidth <= 600)
+			if (ActualWidth < 600)
 				foreach (var item in MainPropertiesViewModel.NavigationViewItems) item.IsCompact = true;
 			else
 				foreach (var item in MainPropertiesViewModel.NavigationViewItems) item.IsCompact = false;

From 076ffe452171c53515543573042684b6009effff Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sun, 4 May 2025 16:32:42 -0400
Subject: [PATCH 2/2] Spacing

---
 .../Views/Properties/MainPropertiesPage.xaml.cs          | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
index 5f568fb9ecb6..0490036cb2a2 100644
--- a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
+++ b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
@@ -1,17 +1,14 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Windows.Graphics;
 using Files.App.ViewModels.Properties;
-using Microsoft.UI;
+using Microsoft.UI.Input;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Navigation;
+using Windows.Graphics;
 using Windows.System;
-using Windows.UI;
-using Microsoft.UI.Input;
 
 namespace Files.App.Views.Properties
 {
@@ -33,7 +30,7 @@ public MainPropertiesPage()
 				FlowDirection = FlowDirection.RightToLeft;
 		}
 
-		
+
 		// Navigates to specified properties page
 		public bool TryNavigateToPage(PropertiesNavigationViewItemType pageType)
 		{