Code Quality: Replace ThemeHelper with AppThemeModeService (#15150)

0x5bfa · web-flow · commit 9a37c20a4f97 · 2024-04-13T19:35:34.000-07:00
diff --git a/src/Files.App/Data/Contracts/IAppThemeModeService.cs b/src/Files.App/Data/Contracts/IAppThemeModeService.cs
@@ -0,0 +1,38 @@
+﻿// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+
+namespace Files.App.Data.Contracts
+{
+	public interface IAppThemeModeService
+	{
+		/// <summary>
+		/// Gets invoked when application theme mode is changed.
+		/// </summary>
+		public event EventHandler? AppThemeModeChanged;
+
+		/// <summary>
+		/// Gets or sets application theme mode.
+		/// </summary>
+		public ElementTheme AppThemeMode { get; set; }
+
+		/// <summary>
+		/// Refreshes the application theme mode only for the main window.
+		/// </summary>
+		/// <remarks>
+		/// This is a workaround for <a href="https://github.com/microsoft/microsoft-ui-xaml/issues/4651">a WinUI bug</a>.
+		/// </remarks>
+		public void ApplyResources();
+
+		/// <summary>
+		/// Sets application theme mode to the main window or a specific window.
+		/// </summary>
+		/// <param name="window">A window instance to set application theme mode.</param>
+		/// <param name="titleBar">A window's title bar instance to adjust contrast of action buttons.</param>
+		/// <param name="rootTheme">A theme mode to set.</param>
+		/// <param name="callThemeModeChangedEvent">Whether the method should notify the theme mode changed. If this called for a specific window, doesn't have to call.</param>
+		public void SetAppThemeMode(Window? window = null, AppWindowTitleBar? titleBar = null, ElementTheme? rootTheme = null, bool callThemeModeChangedEvent = true);
+	}
+}
diff --git a/src/Files.App/Dialogs/AddBranchDialog.xaml b/src/Files.App/Dialogs/AddBranchDialog.xaml
@@ -15,7 +15,7 @@
 	IsPrimaryButtonEnabled="{x:Bind ViewModel.IsBranchValid, Mode=OneWay}"
 	PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
 	PrimaryButtonText="{helpers:ResourceString Name=Create}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
diff --git a/src/Files.App/Dialogs/AddBranchDialog.xaml.cs b/src/Files.App/Dialogs/AddBranchDialog.xaml.cs
@@ -2,12 +2,16 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.ViewModels.Dialogs;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
 namespace Files.App.Dialogs
 {
 	public sealed partial class AddBranchDialog : ContentDialog, IDialog<AddBranchDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public AddBranchDialogViewModel ViewModel
 		{
 			get => (AddBranchDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/AddItemDialog.xaml b/src/Files.App/Dialogs/AddItemDialog.xaml
@@ -15,7 +15,7 @@
 	CornerRadius="{StaticResource OverlayCornerRadius}"
 	HighContrastAdjustment="None"
 	Loaded="AddItemDialog_Loaded"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
diff --git a/src/Files.App/Dialogs/AddItemDialog.xaml.cs b/src/Files.App/Dialogs/AddItemDialog.xaml.cs
@@ -12,6 +12,9 @@ public sealed partial class AddItemDialog : ContentDialog, IDialog<AddItemDialog
 	{
 		private readonly IAddItemService addItemService = Ioc.Default.GetRequiredService<IAddItemService>();
 
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public AddItemDialogViewModel ViewModel
 		{
 			get => (AddItemDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/CreateArchiveDialog.xaml b/src/Files.App/Dialogs/CreateArchiveDialog.xaml
@@ -18,7 +18,7 @@
 	IsPrimaryButtonEnabled="{x:Bind ViewModel.IsNameValid, Mode=OneWay}"
 	Loaded="ContentDialog_Loaded"
 	PrimaryButtonText="{helpers:ResourceString Name=Create}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
 
diff --git a/src/Files.App/Dialogs/CreateArchiveDialog.xaml.cs b/src/Files.App/Dialogs/CreateArchiveDialog.xaml.cs
@@ -10,6 +10,9 @@ namespace Files.App.Dialogs
 {
 	public sealed partial class CreateArchiveDialog : ContentDialog
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		private bool canCreate = false;
 		public bool CanCreate => canCreate;
 
diff --git a/src/Files.App/Dialogs/CreateShortcutDialog.xaml b/src/Files.App/Dialogs/CreateShortcutDialog.xaml
@@ -12,7 +12,7 @@
 	IsPrimaryButtonEnabled="{x:Bind ViewModel.IsLocationValid, Mode=OneWay}"
 	PrimaryButtonCommand="{x:Bind ViewModel.PrimaryButtonCommand}"
 	PrimaryButtonText="{helpers:ResourceString Name=Create}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
diff --git a/src/Files.App/Dialogs/CreateShortcutDialog.xaml.cs b/src/Files.App/Dialogs/CreateShortcutDialog.xaml.cs
@@ -3,13 +3,17 @@
 
 using Files.App.ViewModels.Dialogs;
 using Files.App.ViewModels.Dialogs;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
 
 namespace Files.App.Dialogs
 {
 	public sealed partial class CreateShortcutDialog : ContentDialog, IDialog<CreateShortcutDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public CreateShortcutDialogViewModel ViewModel
 		{
 			get => (CreateShortcutDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/CredentialDialog.xaml b/src/Files.App/Dialogs/CredentialDialog.xaml
@@ -13,7 +13,7 @@
 	PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
 	PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
 	PrimaryButtonText="{helpers:ResourceString Name=OK}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
diff --git a/src/Files.App/Dialogs/CredentialDialog.xaml.cs b/src/Files.App/Dialogs/CredentialDialog.xaml.cs
@@ -1,13 +1,17 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Text;
 
 namespace Files.App.Dialogs
 {
 	public sealed partial class CredentialDialog : ContentDialog, IDialog<CredentialDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public CredentialDialogViewModel ViewModel
 		{
 			get => (CredentialDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml
@@ -12,7 +12,7 @@
 	HighContrastAdjustment="None"
 	PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
 	PrimaryButtonText="{helpers:ResourceString Name=Extract}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
diff --git a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs
@@ -2,13 +2,17 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.ViewModels.Dialogs;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Text;
 
 namespace Files.App.Dialogs
 {
 	public sealed partial class DecompressArchiveDialog : ContentDialog
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public DecompressArchiveDialogViewModel ViewModel
 		{
 			get => (DecompressArchiveDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/DynamicDialog.xaml b/src/Files.App/Dialogs/DynamicDialog.xaml
@@ -19,7 +19,7 @@
 	KeyDown="ContentDialog_KeyDown"
 	PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
 	PrimaryButtonText="{x:Bind ViewModel.PrimaryButtonText, Mode=OneWay}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	SecondaryButtonClick="ContentDialog_SecondaryButtonClick"
 	SecondaryButtonText="{x:Bind ViewModel.SecondaryButtonText, Mode=OneWay}"
 	Style="{StaticResource DefaultContentDialogStyle}"
diff --git a/src/Files.App/Dialogs/DynamicDialog.xaml.cs b/src/Files.App/Dialogs/DynamicDialog.xaml.cs
@@ -2,12 +2,16 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.ViewModels.Dialogs;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
 namespace Files.App.Dialogs
 {
 	public sealed partial class DynamicDialog : ContentDialog, IDisposable
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public DynamicDialogViewModel ViewModel
 		{
 			get => (DynamicDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/ElevateConfirmDialog.xaml b/src/Files.App/Dialogs/ElevateConfirmDialog.xaml
@@ -14,7 +14,7 @@
 	DefaultButton="None"
 	HighContrastAdjustment="None"
 	PrimaryButtonText="{helpers:ResourceString Name=Yes}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
 
diff --git a/src/Files.App/Dialogs/ElevateConfirmDialog.xaml.cs b/src/Files.App/Dialogs/ElevateConfirmDialog.xaml.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.ViewModels.Dialogs;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System;
 using System.Threading.Tasks;
@@ -10,6 +11,9 @@ namespace Files.App.Dialogs
 {
 	public sealed partial class ElevateConfirmDialog : ContentDialog, IDialog<ElevateConfirmDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public ElevateConfirmDialogViewModel ViewModel
 		{
 			get => (ElevateConfirmDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/FileTooLargeDialog.xaml b/src/Files.App/Dialogs/FileTooLargeDialog.xaml
@@ -11,7 +11,7 @@
 	DefaultButton="Primary"
 	HighContrastAdjustment="None"
 	PrimaryButtonText="{helpers:ResourceString Name=OK}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
 
diff --git a/src/Files.App/Dialogs/FileTooLargeDialog.xaml.cs b/src/Files.App/Dialogs/FileTooLargeDialog.xaml.cs
@@ -1,12 +1,16 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
 namespace Files.App.Dialogs
 {
 	public sealed partial class FileTooLargeDialog : ContentDialog, IDialog<FileTooLargeDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public FileTooLargeDialogViewModel ViewModel
 		{
 			get => (FileTooLargeDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/FilesystemOperationDialog.xaml b/src/Files.App/Dialogs/FilesystemOperationDialog.xaml
@@ -19,7 +19,7 @@
 	IsPrimaryButtonEnabled="{x:Bind ViewModel.PrimaryButtonEnabled, Mode=OneWay}"
 	Opened="FilesystemOperationDialog_Opened"
 	PrimaryButtonText="{x:Bind ViewModel.PrimaryButtonText, Mode=OneWay}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	SecondaryButtonCommand="{x:Bind ViewModel.SecondaryButtonClickCommand, Mode=OneWay}"
 	SecondaryButtonText="{x:Bind ViewModel.SecondaryButtonText, Mode=OneWay}"
 	Style="{StaticResource DefaultContentDialogStyle}"
diff --git a/src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs b/src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs
@@ -10,6 +10,9 @@ namespace Files.App.Dialogs
 {
 	public sealed partial class FilesystemOperationDialog : ContentDialog, IDialog<FileSystemDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public FileSystemDialogViewModel ViewModel
 		{
 			get => (FileSystemDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/GitHubLoginDialog.xaml b/src/Files.App/Dialogs/GitHubLoginDialog.xaml
@@ -15,7 +15,7 @@
 	HighContrastAdjustment="None"
 	PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
 	PrimaryButtonText="{helpers:ResourceString Name=OK}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
 
diff --git a/src/Files.App/Dialogs/GitHubLoginDialog.xaml.cs b/src/Files.App/Dialogs/GitHubLoginDialog.xaml.cs
@@ -1,13 +1,17 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Windows.ApplicationModel.DataTransfer;
 
 namespace Files.App.Dialogs
 {
 	public sealed partial class GitHubLoginDialog : ContentDialog, IDialog<GitHubLoginDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public GitHubLoginDialogViewModel ViewModel
 		{
 			get => (GitHubLoginDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/ReleaseNotesDialog.xaml b/src/Files.App/Dialogs/ReleaseNotesDialog.xaml
@@ -11,7 +11,7 @@
 	CornerRadius="{StaticResource OverlayCornerRadius}"
 	DefaultButton="None"
 	HighContrastAdjustment="None"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
 	<ContentDialog.Resources>
diff --git a/src/Files.App/Dialogs/ReleaseNotesDialog.xaml.cs b/src/Files.App/Dialogs/ReleaseNotesDialog.xaml.cs
@@ -8,6 +8,9 @@ namespace Files.App.Dialogs
 {
 	public sealed partial class ReleaseNotesDialog : ContentDialog, IDialog<ReleaseNotesDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public ReleaseNotesDialogViewModel ViewModel
 		{
 			get => (ReleaseNotesDialogViewModel)DataContext;
diff --git a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml
@@ -13,7 +13,7 @@
 	IsPrimaryButtonEnabled="True"
 	PrimaryButtonCommand="{x:Bind ViewModel.PrimaryButtonCommand}"
 	PrimaryButtonText="{helpers:ResourceString Name=Save}"
-	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
+	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"
 	mc:Ignorable="d">
diff --git a/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs b/src/Files.App/Dialogs/ReorderSidebarItemsDialog.xaml.cs
@@ -17,6 +17,9 @@ namespace Files.App.Dialogs
 {
 	public sealed partial class ReorderSidebarItemsDialog : ContentDialog, IDialog<ReorderSidebarItemsDialogViewModel>
 	{
+		private FrameworkElement RootAppElement
+			=> (FrameworkElement)MainWindow.Instance.Content;
+
 		public ReorderSidebarItemsDialogViewModel ViewModel
 		{
 			get => (ReorderSidebarItemsDialogViewModel)DataContext;
diff --git a/src/Files.App/Helpers/Application/AppLifecycleHelper.cs b/src/Files.App/Helpers/Application/AppLifecycleHelper.cs
@@ -159,6 +159,7 @@ public static IHost ConfigureHost()
 					.AddSingleton<IMultitaskingContext, MultitaskingContext>()
 					.AddSingleton<ITagsContext, TagsContext>()
 					// Services
+					.AddSingleton<IAppThemeModeService, AppThemeModeService>()
 					.AddSingleton<IDialogService, DialogService>()
 					.AddSingleton<IImageService, ImagingService>()
 					.AddSingleton<IThreadingService, ThreadingService>()
diff --git a/src/Files.App/Helpers/UI/ThemeHelper.cs b/src/Files.App/Helpers/UI/ThemeHelper.cs
diff --git a/src/Files.App/Services/AppThemeModeService.cs b/src/Files.App/Services/AppThemeModeService.cs
diff --git a/src/Files.App/Services/ResourcesService.cs b/src/Files.App/Services/ResourcesService.cs
diff --git a/src/Files.App/Services/Settings/AppearanceSettingsService.cs b/src/Files.App/Services/Settings/AppearanceSettingsService.cs
diff --git a/src/Files.App/Services/Settings/IAppearanceSettingsService.cs b/src/Files.App/Services/Settings/IAppearanceSettingsService.cs
diff --git a/src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs b/src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs
diff --git a/src/Files.App/ViewModels/MainPageViewModel.cs b/src/Files.App/ViewModels/MainPageViewModel.cs
diff --git a/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs b/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs
diff --git a/src/Files.App/ViewModels/SettingsViewModel.cs b/src/Files.App/ViewModels/SettingsViewModel.cs
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,16 @@`
`2`	`2`	`// Licensed under the MIT License. See the LICENSE.`
`3`	`3`
`4`	`4`	`using Files.App.ViewModels.Dialogs;`
	`5`	`+using Microsoft.UI.Xaml;`
`5`	`6`	`using Microsoft.UI.Xaml.Controls;`
`6`	`7`
`7`	`8`	`namespace Files.App.Dialogs`
`8`	`9`	`{`
`9`	`10`	`public sealed partial class AddBranchDialog : ContentDialog, IDialog<AddBranchDialogViewModel>`
`10`	`11`	`{`
	`12`	`+ private FrameworkElement RootAppElement`
	`13`	`+ => (FrameworkElement)MainWindow.Instance.Content;`
	`14`	`+`
`11`	`15`	`public AddBranchDialogViewModel ViewModel`
`12`	`16`	`{`
`13`	`17`	`get => (AddBranchDialogViewModel)DataContext;`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@ public sealed partial class AddItemDialog : ContentDialog, IDialog<AddItemDialog`
`12`	`12`	`{`
`13`	`13`	`private readonly IAddItemService addItemService = Ioc.Default.GetRequiredService<IAddItemService>();`
`14`	`14`
	`15`	`+ private FrameworkElement RootAppElement`
	`16`	`+ => (FrameworkElement)MainWindow.Instance.Content;`
	`17`	`+`
`15`	`18`	`public AddItemDialogViewModel ViewModel`
`16`	`19`	`{`
`17`	`20`	`get => (AddItemDialogViewModel)DataContext;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@ namespace Files.App.Dialogs`
`10`	`10`	`{`
`11`	`11`	`public sealed partial class CreateArchiveDialog : ContentDialog`
`12`	`12`	`{`
	`13`	`+ private FrameworkElement RootAppElement`
	`14`	`+ => (FrameworkElement)MainWindow.Instance.Content;`
	`15`	`+`
`13`	`16`	`private bool canCreate = false;`
`14`	`17`	`public bool CanCreate => canCreate;`
`15`	`18`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,17 @@`
`3`	`3`
`4`	`4`	`using Files.App.ViewModels.Dialogs;`
`5`	`5`	`using Files.App.ViewModels.Dialogs;`
	`6`	`+using Microsoft.UI.Xaml;`
`6`	`7`	`using Microsoft.UI.Xaml.Controls;`
`7`	`8`	`using Microsoft.UI.Xaml.Data;`
`8`	`9`
`9`	`10`	`namespace Files.App.Dialogs`
`10`	`11`	`{`
`11`	`12`	`public sealed partial class CreateShortcutDialog : ContentDialog, IDialog<CreateShortcutDialogViewModel>`
`12`	`13`	`{`
	`14`	`+ private FrameworkElement RootAppElement`
	`15`	`+ => (FrameworkElement)MainWindow.Instance.Content;`
	`16`	`+`
`13`	`17`	`public CreateShortcutDialogViewModel ViewModel`
`14`	`18`	`{`
`15`	`19`	`get => (CreateShortcutDialogViewModel)DataContext;`