Code Quality: Added hierarchical page navigation to UI Test app (#15879)

Author: 0x5bfa

tests/Files.App.UITests/App.xaml.cs

@@ -5,33 +5,16 @@
 
 namespace Files.App.UITests
 {
-	/// <summary>
-	/// Provides application-specific behavior to supplement the default Application class.
-	/// </summary>
 	public partial class App : Application
 	{
-		/// <summary>
-		/// Initializes the singleton application object.  This is the first line of authored code
-		/// executed, and as such is the logical equivalent of main() or WinMain().
-		/// </summary>
 		public App()
 		{
-			this.InitializeComponent();
+			InitializeComponent();
 		}
 
-		/// <summary>
-		/// Invoked when the application is launched.
-		/// </summary>
-		/// <param name="args">Details about the launch request and process.</param>
-		protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+		protected override void OnLaunched(LaunchActivatedEventArgs args)
 		{
-			m_window = new MainWindow();
-
-			m_window.ExtendsContentIntoTitleBar = true;
-
-			m_window.Activate();
+			MainWindow.Instance.Activate();
 		}
-
-		private Window m_window;
 	}
 }

tests/Files.App.UITests/MainWindow.xaml

@@ -7,7 +7,6 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="using:Files.App.UITests"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:uc="using:Files.App.UITests.UserControls"
 	Title="Files.App.Controls.UITests"
 	mc:Ignorable="d">
 
@@ -21,6 +20,7 @@
 			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
 
+		<!--  Title bar  -->
 		<Grid
 			x:Name="FauxTitleBar"
 			Grid.Row="0"
@@ -59,10 +59,54 @@
 
 		</Grid>
 
-		<uc:ThemedIconsUC
+		<NavigationView
+			x:Name="MainNavigationView"
 			Grid.Row="1"
-			HorizontalAlignment="Stretch"
-			VerticalAlignment="Stretch" />
+			IsBackButtonVisible="Collapsed"
+			IsSettingsVisible="False"
+			OpenPaneLength="256"
+			SelectionChanged="NavigationView_SelectionChanged">
+
+			<NavigationView.MenuItems>
+				<NavigationViewItem Content="Controls">
+					<NavigationViewItem.Icon>
+						<FontIcon Glyph="&#xE73A;" />
+					</NavigationViewItem.Icon>
+					<NavigationViewItem.MenuItems>
+						<NavigationViewItem Content="ThemedIcon" Tag="ThemedIconPage" />
+					</NavigationViewItem.MenuItems>
+				</NavigationViewItem>
+			</NavigationView.MenuItems>
+
+			<NavigationView.Content>
+				<ScrollViewer>
+					<Frame x:Name="MainFrame" />
+				</ScrollViewer>
+			</NavigationView.Content>
+
+			<NavigationView.PaneFooter>
+				<Grid
+					Margin="8,2"
+					Padding="12,8"
+					Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+					CornerRadius="4"
+					Visibility="{Binding MainNavigationView.IsPaneOpen, Mode=OneWay}">
+					<TextBlock VerticalAlignment="Center" Text="Theme mode:" />
+					<ComboBox
+						x:Name="ThemeModeSelectorCombBox"
+						HorizontalAlignment="Right"
+						SelectedIndex="0"
+						SelectionChanged="ThemeModeSelectorCombBox_SelectionChanged">
+						<ComboBox.Items>
+							<ComboBoxItem Content="Default" />
+							<ComboBoxItem Content="Light" />
+							<ComboBoxItem Content="Dark" />
+						</ComboBox.Items>
+					</ComboBox>
+				</Grid>
+			</NavigationView.PaneFooter>
+
+		</NavigationView>
 	</Grid>
 
 </Window>

tests/Files.App.UITests/MainWindow.xaml.cs

@@ -1,18 +1,57 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.App.UITests.Views;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Files.App.UITests
 {
-	/// <summary>
-	/// An empty window that can be used on its own or navigated to within a Frame.
-	/// </summary>
 	public sealed partial class MainWindow : Window
 	{
-		public MainWindow()
+		private static MainWindow? _Instance;
+		public static MainWindow Instance => _Instance ??= new();
+
+		private MainWindow()
+		{
+			InitializeComponent();
+
+			ExtendsContentIntoTitleBar = true;
+
+			MainFrame.Navigate(typeof(MainPage));
+		}
+
+		private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
 		{
-			this.InitializeComponent();
+			if (args.SelectedItem is not NavigationViewItem item || item.Tag is not string tag)
+				return;
+
+			switch (tag)
+			{
+				case "ThemedIconPage":
+					MainFrame.Navigate(typeof(ThemedIconPage));
+					break;
+			}
+		}
+
+		private void ThemeModeSelectorCombBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+		{
+			if (sender is not ComboBox comboBox ||
+				Content is not FrameworkElement element)
+				return;
+
+			switch (comboBox.SelectedIndex)
+			{
+				case 0:
+					element.RequestedTheme = ElementTheme.Default;
+					break;
+				case 1:
+					element.RequestedTheme = ElementTheme.Light;
+					break;
+				case 2:
+					element.RequestedTheme = ElementTheme.Dark;
+					break;
+			}
 		}
 	}
 }