Feature: Lazily loading themes to improve startup time (#10329)

hez2010 · yaira2 · web-flow · commit 2d02fc6512d7 · 2022-10-30T11:02:59.000-04:00
* Enable dynamic PGO

* Lazy load other themes

* Fix indents

* Fix tab indents

* Fix tab indents in xaml

* Mvvm

* Fix a bug where selected theme being duplicated in the list

* Use x:Bind where possible

* Add an automation text for loading progress

* Fix tab indents

* Update src/Files.App/Views/SettingsPages/Appearance.xaml

* CR

* Update Appearance.xaml

Co-authored-by: Yair Aichenbaum &lt;39923744+yaichenbaum@users.noreply.github.com&gt;
diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs
@@ -207,7 +207,6 @@ await Task.WhenAll(
 				await Task.WhenAll(
 					TerminalController.InitializeAsync(),
 					JumpList.InitializeAsync(),
-					ExternalResourcesHelper.LoadOtherThemesAsync(),
 					ContextFlyoutItemHelper.CachedNewContextMenuEntries
 				);
 			});
@@ -464,4 +463,4 @@ public static AppWindow GetAppWindow(Window w)
 
 		public static IntPtr WindowHandle { get; private set; }
 	}
-}
+}
diff --git a/src/Files.App/Dialogs/DynamicDialog.xaml b/src/Files.App/Dialogs/DynamicDialog.xaml
@@ -7,19 +7,19 @@
 	xmlns:i="using:Microsoft.Xaml.Interactivity"
 	xmlns:icore="using:Microsoft.Xaml.Interactions.Core"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Title="{Binding TitleText, Mode=OneWay}"
+	Title="{x:Bind ViewModel.TitleText, Mode=OneWay}"
 	CloseButtonClick="ContentDialog_CloseButtonClick"
-	CloseButtonText="{Binding CloseButtonText, Mode=OneWay}"
+	CloseButtonText="{x:Bind ViewModel.CloseButtonText, Mode=OneWay}"
 	CornerRadius="{StaticResource OverlayCornerRadius}"
 	DefaultButton="Primary"
-	IsPrimaryButtonEnabled="{Binding IsPrimaryButtonEnabled, Mode=OneWay}"
-	IsSecondaryButtonEnabled="{Binding IsSecondaryButtonEnabled, Mode=OneWay}"
+	IsPrimaryButtonEnabled="{x:Bind ViewModel.IsPrimaryButtonEnabled, Mode=OneWay}"
+	IsSecondaryButtonEnabled="{x:Bind ViewModel.IsSecondaryButtonEnabled, Mode=OneWay}"
 	KeyDown="ContentDialog_KeyDown"
 	PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
-	PrimaryButtonText="{Binding PrimaryButtonText, Mode=OneWay}"
+	PrimaryButtonText="{x:Bind ViewModel.PrimaryButtonText, Mode=OneWay}"
 	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
 	SecondaryButtonClick="ContentDialog_SecondaryButtonClick"
-	SecondaryButtonText="{Binding SecondaryButtonText, Mode=OneWay}"
+	SecondaryButtonText="{x:Bind ViewModel.SecondaryButtonText, Mode=OneWay}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
 
@@ -36,7 +36,7 @@
 			HorizontalAlignment="Left"
 			VerticalAlignment="Center"
 			x:Load="{x:Bind ViewModel.SubtitleLoad, Mode=OneWay}"
-			Text="{Binding SubtitleText, Mode=OneWay}"
+			Text="{x:Bind ViewModel.SubtitleText, Mode=OneWay}"
 			TextWrapping="WrapWholeWords" />
 
 		<!--  The dynamic content control  -->
@@ -48,11 +48,11 @@
 			HorizontalContentAlignment="Stretch"
 			VerticalContentAlignment="Stretch"
 			x:Load="{x:Bind ViewModel.DisplayControlLoad, Mode=OneWay}"
-			Content="{Binding DisplayControl, Mode=OneWay}">
+			Content="{x:Bind ViewModel.DisplayControl, Mode=OneWay}">
 			<i:Interaction.Behaviors>
 				<!--  No need to specify CommandParameter - `e` is passed by default  -->
 				<icore:EventTriggerBehavior EventName="Loaded">
-					<icore:InvokeCommandAction Command="{Binding DisplayControlOnLoadedCommand, Mode=OneWay}" />
+					<icore:InvokeCommandAction Command="{x:Bind ViewModel.DisplayControlOnLoadedCommand, Mode=OneWay}" />
 				</icore:EventTriggerBehavior>
 			</i:Interaction.Behaviors>
 		</ContentControl>
diff --git a/src/Files.App/Dialogs/ElevateConfirmDialog.xaml b/src/Files.App/Dialogs/ElevateConfirmDialog.xaml
@@ -20,10 +20,10 @@
 		<Style BasedOn="{StaticResource AccentButtonStyle}" TargetType="Button">
 			<Setter Property="ContentTemplate">
 				<Setter.Value>
-					<DataTemplate x:DataType="Button">
+					<DataTemplate x:DataType="ContentDialog">
 						<StackPanel Orientation="Horizontal" Spacing="5">
 							<FontIcon FontSize="14" Glyph="&#xEA18;" />
-							<TextBlock Text="{Binding PrimaryButtonText, ElementName=ConfirmElevationDialog}" />
+							<TextBlock Text="{x:Bind PrimaryButtonText, Mode=OneWay}" />
 						</StackPanel>
 					</DataTemplate>
 				</Setter.Value>
diff --git a/src/Files.App/Files.App.csproj b/src/Files.App/Files.App.csproj
@@ -23,6 +23,8 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>Debug;Release;Sideload</Configurations>
+    <TieredCompilation>true</TieredCompilation>
+    <TieredPgo>true</TieredPgo>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DefineConstants>TRACE;DEBUG;NETFX_CORE;DISABLE_XAML_GENERATED_MAIN</DefineConstants>
diff --git a/src/Files.App/Helpers/ExternalResourcesHelper.cs b/src/Files.App/Helpers/ExternalResourcesHelper.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Xaml.Markup;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -13,7 +14,7 @@ namespace Files.App.Helpers
 {
 	public class ExternalResourcesHelper
 	{
-		public List<AppTheme> Themes = new List<AppTheme>()
+		public readonly ObservableCollection<AppTheme> Themes = new()
 		{
 			new AppTheme
 			{
@@ -71,13 +72,13 @@ public async Task LoadOtherThemesAsync()
 
 		private async Task AddThemesAsync(StorageFolder folder)
 		{
-			foreach (var file in (await folder.GetFilesAsync()).Where(x => x.FileType == ".xaml"))
+			foreach (var file in (await folder.GetFilesAsync()).Where(x => string.Equals(x.FileType, ".xaml", StringComparison.InvariantCultureIgnoreCase)))
 			{
-				if (!Themes.Exists(t => t.AbsolutePath == file.Path))
+				if (!Themes.Any(t => t.AbsolutePath == file.Path))
 				{
 					Themes.Add(new AppTheme()
 					{
-						Name = file.Name.Replace(".xaml", "", StringComparison.Ordinal),
+						Name = file.Name[..^5],
 						Path = file.Name,
 						AbsolutePath = file.Path,
 					});
@@ -93,6 +94,10 @@ public async Task<bool> TryLoadThemeAsync(AppTheme theme)
 				if (xaml is not null)
 				{
 					App.Current.Resources.MergedDictionaries.Add(xaml);
+					if (!Themes.Any(t => t.AbsolutePath == theme.AbsolutePath))
+					{
+						Themes.Add(theme);
+					}
 					return true;
 				}
 				return false;
@@ -164,4 +169,4 @@ public class AppTheme
 		public string Key => $"{Name}";
 		public bool IsImportedTheme { get; set; }
 	}
-}
+}
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -2853,4 +2853,7 @@
   <data name="DeleteShortcutDescription" xml:space="preserve">
     <value>The target destination cannot be found {0}. Do you want to delete this shortcut?</value>
   </data>
+  <data name="LoadingThemes" xml:space="preserve">
+    <value>Loading Themes</value>
+  </data>
 </root>
diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml b/src/Files.App/UserControls/PathBreadcrumb.xaml
@@ -8,22 +8,23 @@
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:local="using:Files.App.UserControls"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:views="using:Files.App.Views"
 	d:DesignHeight="300"
 	d:DesignWidth="400"
 	mc:Ignorable="d">
 	<UserControl.Resources>
-		<DataTemplate x:Name="CurrentItem">
+		<DataTemplate x:Name="CurrentItem" x:DataType="views:PathBoxItem">
 			<StackPanel
 				x:Name="ListViewItemContentGrid"
 				AllowDrop="True"
-				AutomationProperties.Name="{Binding Title}"
+				AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
 				Background="Transparent"
 				DragLeave="PathBoxItem_DragLeave"
 				DragOver="PathBoxItem_DragOver"
 				Drop="PathBoxItem_Drop"
 				Orientation="Horizontal"
 				Spacing="4"
-				Tag="{Binding Path}">
+				Tag="{x:Bind Path, Mode=OneWay}">
 				<Interactivity:Interaction.Behaviors>
 					<Core:EventTriggerBehavior EventName="PointerEntered">
 						<Core:ChangePropertyAction PropertyName="Opacity">
@@ -45,29 +46,29 @@
 				<TextBlock
 					FontSize="12"
 					FontWeight="Medium"
-					Text="{Binding Title}" />
+					Text="{x:Bind Title, Mode=OneWay}" />
 				<FontIcon FontSize="12" Glyph="&#xE76C;" />
 			</StackPanel>
 		</DataTemplate>
-		<DataTemplate x:Name="ParentItems">
+		<DataTemplate x:Name="ParentItems" x:DataType="views:PathBoxItem">
 			<StackPanel
 				x:Name="ListViewItemContentGrid"
 				VerticalAlignment="Center"
 				AllowDrop="True"
-				AutomationProperties.Name="{Binding Title}"
+				AutomationProperties.Name="{x:Bind Title, Mode=OneWay}"
 				Background="Transparent"
 				DragLeave="PathBoxItem_DragLeave"
 				DragOver="PathBoxItem_DragOver"
 				Drop="PathBoxItem_Drop"
 				Orientation="Horizontal"
 				Spacing="4"
-				Tag="{Binding Path}">
+				Tag="{x:Bind Path, Mode=OneWay}">
 				<TextBlock
 					Padding="0,4"
 					FontSize="12"
 					PointerPressed="PathBoxItem_PointerPressed"
 					Tapped="PathBoxItem_Tapped"
-					Text="{Binding Title}">
+					Text="{x:Bind Title, Mode=OneWay}">
 					<Interactivity:Interaction.Behaviors>
 						<Core:EventTriggerBehavior EventName="PointerEntered">
 							<Core:ChangePropertyAction PropertyName="Opacity">
diff --git a/src/Files.App/ViewModels/SettingsViewModels/AppearanceViewModel.cs b/src/Files.App/ViewModels/SettingsViewModels/AppearanceViewModel.cs
@@ -6,6 +6,7 @@
 using Microsoft.UI.Xaml;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 
 namespace Files.App.ViewModels.SettingsViewModels
@@ -27,8 +28,8 @@ public AppearanceViewModel()
 			};
 		}
 
-		public List<string> Themes { get; set; }
-		public List<AppTheme> CustomThemes => App.ExternalResourcesHelper.Themes;
+		public List<string> Themes { get; private set; }
+		public ObservableCollection<AppTheme> CustomThemes => App.ExternalResourcesHelper.Themes;
 
 		public int SelectedThemeIndex
 		{
@@ -250,6 +251,17 @@ public bool ShowRecentFilesWidget
 			}
 		}
 
+		private bool isLoadingThemes;
+		public bool IsLoadingThemes
+		{
+			get => isLoadingThemes;
+			set
+			{
+				isLoadingThemes = value;
+				OnPropertyChanged();
+			}
+		}
+
 		public Task OpenThemesFolder()
 		{
 			//await CoreApplication.MainView.Dispatcher.YieldAsync(); // WINUI3
diff --git a/src/Files.App/ViewModels/SettingsViewModels/FoldersViewModel.cs b/src/Files.App/ViewModels/SettingsViewModels/FoldersViewModel.cs
@@ -21,7 +21,7 @@ public FoldersViewModel()
 			ResetLayoutPreferencesCommand = new RelayCommand(ResetLayoutPreferences);
 			ShowResetLayoutPreferencesTipCommand = new RelayCommand(() => IsResetLayoutPreferencesTipOpen = true);
 
-			SelectedDefaultLayoutModeIndex = (long)DefaultLayoutMode;
+			SelectedDefaultLayoutModeIndex = (int)DefaultLayoutMode;
 		}
 
 		// Properties
@@ -33,8 +33,8 @@ public bool IsResetLayoutPreferencesTipOpen
 			set => SetProperty(ref isResetLayoutPreferencesTipOpen, value);
 		}
 
-		private long selectedDefaultLayoutModeIndex;
-		public long SelectedDefaultLayoutModeIndex
+		private int selectedDefaultLayoutModeIndex;
+		public int SelectedDefaultLayoutModeIndex
 		{
 			get => selectedDefaultLayoutModeIndex;
 			set
diff --git a/src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs b/src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs
@@ -349,25 +349,6 @@ private async Task AddPage(string path = null)
 				PagesOnStartupList.Add(new PageOnStartupViewModel(path));
 		}
 
-		public class PageOnStartupViewModel
-		{
-			public string Text
-			{
-				get
-				{
-					if (Path == "Home".GetLocalizedResource())
-						return "Home".GetLocalizedResource();
-					if (Path == CommonPaths.RecycleBinPath)
-						return ApplicationData.Current.LocalSettings.Values.Get("RecycleBin_Title", "Recycle Bin");
-					return Path;
-				}
-			}
-
-			public string Path { get; }
-
-			internal PageOnStartupViewModel(string path) => Path = path;
-		}
-
 		private void ReloadTerminals(TerminalController controller)
 		{
 			dispatcherQueue.EnqueueAsync(() =>
@@ -574,6 +555,25 @@ public void Dispose()
 		}
 	}
 
+	public class PageOnStartupViewModel
+	{
+		public string Text
+		{
+			get
+			{
+				if (Path == "Home".GetLocalizedResource())
+					return "Home".GetLocalizedResource();
+				if (Path == CommonPaths.RecycleBinPath)
+					return ApplicationData.Current.LocalSettings.Values.Get("RecycleBin_Title", "Recycle Bin");
+				return Path;
+			}
+		}
+
+		public string Path { get; }
+
+		internal PageOnStartupViewModel(string path) => Path = path;
+	}
+
 	public class AppLanguageItem
 	{
 		public string LanguagID { get; set; }
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
@@ -341,7 +341,7 @@
 						HorizontalAlignment="Left"
 						FontSize="12px"
 						Opacity="0.6"
-						Text="{Binding ItemType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+						Text="{x:Bind ItemType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
 						TextTrimming="CharacterEllipsis"
 						TextWrapping="NoWrap" />
 					<TextBlock
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
@@ -23,6 +23,7 @@
 using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using Windows.ApplicationModel;
 using Windows.Graphics;
@@ -80,10 +81,10 @@ public MainPage()
 
 			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
 
-			LoadSelectedTheme();
+			DispatcherQueue.TryEnqueue(async () => await LoadSelectedTheme());
 		}
 
-		private async void LoadSelectedTheme()
+		private async Task LoadSelectedTheme()
 		{
 			App.ExternalResourcesHelper.OverrideAppResources(UserSettingsService.AppearanceSettingsService.UseCompactStyles);
 			await App.ExternalResourcesHelper.LoadSelectedTheme();
diff --git a/src/Files.App/Views/Pages/PropertiesLibrary.xaml b/src/Files.App/Views/Pages/PropertiesLibrary.xaml
@@ -89,20 +89,20 @@
 				SelectedIndex="{x:Bind SelectedFolderIndex, Mode=TwoWay}"
 				SelectionMode="Single">
 				<ListView.ItemTemplate>
-					<DataTemplate>
+					<DataTemplate xmlns:vm="using:Files.App.Views" x:DataType="vm:LibraryFolder">
 						<Grid>
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="36" />
 								<ColumnDefinition />
 							</Grid.ColumnDefinitions>
-							<FontIcon Glyph="&#xE008;" Visibility="{Binding IsDefault, Converter={StaticResource BoolToVisibilityConverter}}" />
+							<FontIcon Glyph="&#xE008;" Visibility="{x:Bind IsDefault, Converter={StaticResource BoolToVisibilityConverter}}" />
 							<TextBlock
 								Grid.Column="2"
 								Margin="0,0,0,2"
 								VerticalAlignment="Center"
-								Text="{Binding Path}"
+								Text="{x:Bind Path}"
 								TextTrimming="CharacterEllipsis"
-								ToolTipService.ToolTip="{Binding Path}" />
+								ToolTipService.ToolTip="{x:Bind Path}" />
 						</Grid>
 					</DataTemplate>
 				</ListView.ItemTemplate>
diff --git a/src/Files.App/Views/Pages/PropertiesLibrary.xaml.cs b/src/Files.App/Views/Pages/PropertiesLibrary.xaml.cs
@@ -238,11 +238,11 @@ public override void Dispose()
 		{
 		}
 
-		public class LibraryFolder
-		{
-			public string Path { get; set; }
+	}
+	public class LibraryFolder
+	{
+		public string Path { get; set; }
 
-			public bool IsDefault { get; set; }
-		}
+		public bool IsDefault { get; set; }
 	}
 }
diff --git a/src/Files.App/Views/SettingsPages/Appearance.xaml b/src/Files.App/Views/SettingsPages/Appearance.xaml
diff --git a/src/Files.App/Views/SettingsPages/Appearance.xaml.cs b/src/Files.App/Views/SettingsPages/Appearance.xaml.cs
diff --git a/src/Files.App/Views/SettingsPages/Experimental.xaml b/src/Files.App/Views/SettingsPages/Experimental.xaml
diff --git a/src/Files.App/Views/SettingsPages/Folders.xaml b/src/Files.App/Views/SettingsPages/Folders.xaml
diff --git a/src/Files.App/Views/SettingsPages/Preferences.xaml b/src/Files.App/Views/SettingsPages/Preferences.xaml

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using Microsoft.UI.Xaml.Markup;`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
	`6`	`+using System.Collections.ObjectModel;`
`6`	`7`	`using System.Diagnostics;`
`7`	`8`	`using System.IO;`
`8`	`9`	`using System.Linq;`
`@@ -13,7 +14,7 @@ namespace Files.App.Helpers`
`13`	`14`	`{`
`14`	`15`	`public class ExternalResourcesHelper`
`15`	`16`	`{`
`16`		`- public List<AppTheme> Themes = new List<AppTheme>()`
	`17`	`+ public readonly ObservableCollection<AppTheme> Themes = new()`
`17`	`18`	`{`
`18`	`19`	`new AppTheme`
`19`	`20`	`{`
`@@ -71,13 +72,13 @@ public async Task LoadOtherThemesAsync()`
`71`	`72`
`72`	`73`	`private async Task AddThemesAsync(StorageFolder folder)`
`73`	`74`	`{`
`74`		`- foreach (var file in (await folder.GetFilesAsync()).Where(x => x.FileType == ".xaml"))`
	`75`	`+ foreach (var file in (await folder.GetFilesAsync()).Where(x => string.Equals(x.FileType, ".xaml", StringComparison.InvariantCultureIgnoreCase)))`
`75`	`76`	`{`
`76`		`- if (!Themes.Exists(t => t.AbsolutePath == file.Path))`
	`77`	`+ if (!Themes.Any(t => t.AbsolutePath == file.Path))`
`77`	`78`	`{`
`78`	`79`	`Themes.Add(new AppTheme()`
`79`	`80`	`{`
`80`		`- Name = file.Name.Replace(".xaml", "", StringComparison.Ordinal),`
	`81`	`+ Name = file.Name[..^5],`
`81`	`82`	`Path = file.Name,`
`82`	`83`	`AbsolutePath = file.Path,`
`83`	`84`	`});`
`@@ -93,6 +94,10 @@ public async Task<bool> TryLoadThemeAsync(AppTheme theme)`
`93`	`94`	`if (xaml is not null)`
`94`	`95`	`{`
`95`	`96`	`App.Current.Resources.MergedDictionaries.Add(xaml);`
	`97`	`+ if (!Themes.Any(t => t.AbsolutePath == theme.AbsolutePath))`
	`98`	`+ {`
	`99`	`+ Themes.Add(theme);`
	`100`	`+ }`
`96`	`101`	`return true;`
`97`	`102`	`}`
`98`	`103`	`return false;`
`@@ -164,4 +169,4 @@ public class AppTheme`
`164`	`169`	`public string Key => $"{Name}";`
`165`	`170`	`public bool IsImportedTheme { get; set; }`
`166`	`171`	`}`
`167`		`-}`
	`172`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public FoldersViewModel()`
`21`	`21`	`ResetLayoutPreferencesCommand = new RelayCommand(ResetLayoutPreferences);`
`22`	`22`	`ShowResetLayoutPreferencesTipCommand = new RelayCommand(() => IsResetLayoutPreferencesTipOpen = true);`
`23`	`23`
`24`		`- SelectedDefaultLayoutModeIndex = (long)DefaultLayoutMode;`
	`24`	`+ SelectedDefaultLayoutModeIndex = (int)DefaultLayoutMode;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// Properties`
`@@ -33,8 +33,8 @@ public bool IsResetLayoutPreferencesTipOpen`
`33`	`33`	`set => SetProperty(ref isResetLayoutPreferencesTipOpen, value);`
`34`	`34`	`}`
`35`	`35`
`36`		`- private long selectedDefaultLayoutModeIndex;`
`37`		`- public long SelectedDefaultLayoutModeIndex`
	`36`	`+ private int selectedDefaultLayoutModeIndex;`
	`37`	`+ public int SelectedDefaultLayoutModeIndex`
`38`	`38`	`{`
`39`	`39`	`get => selectedDefaultLayoutModeIndex;`
`40`	`40`	`set`