Feature: Improved UX for the "Create new item" dialog (#16317)

Co-authored-by: hishitetsu <[email protected]>

Author: yaira2

src/Files.App/Helpers/Dialog/DynamicDialogFactory.cs

@@ -58,7 +58,7 @@ public static DynamicDialog GetFor_ShortcutNotFound(string targetPath)
 			return dialog;
 		}
 
-		public static DynamicDialog GetFor_RenameDialog()
+		public static DynamicDialog GetFor_CreateItemDialog(string itemType)
 		{
 			DynamicDialog? dialog = null;
 			TextBox inputText = new()
@@ -70,7 +70,7 @@ public static DynamicDialog GetFor_RenameDialog()
 			{
 				Title = "InvalidFilename/Text".GetLocalizedResource(),
 				PreferredPlacement = TeachingTipPlacementMode.Bottom,
-				DataContext = new RenameDialogViewModel(),
+				DataContext = new CreateItemDialogViewModel(),
 			};
 
 			warning.SetBinding(TeachingTip.TargetProperty, new Binding()
@@ -88,7 +88,7 @@ public static DynamicDialog GetFor_RenameDialog()
 			inputText.TextChanged += (textBox, args) =>
 			{
 				var isInputValid = FilesystemHelpers.IsValidForFilename(inputText.Text);
-				((RenameDialogViewModel)warning.DataContext).IsNameInvalid = !string.IsNullOrEmpty(inputText.Text) && !isInputValid;
+				((CreateItemDialogViewModel)warning.DataContext).IsNameInvalid = !string.IsNullOrEmpty(inputText.Text) && !isInputValid;
 				dialog!.ViewModel.DynamicButtonsEnabled = isInputValid
 														? DynamicDialogButtons.Primary | DynamicDialogButtons.Cancel
 														: DynamicDialogButtons.Cancel;
@@ -104,7 +104,7 @@ public static DynamicDialog GetFor_RenameDialog()
 
 			dialog = new DynamicDialog(new DynamicDialogViewModel()
 			{
-				TitleText = "EnterAnItemName".GetLocalizedResource(),
+				TitleText = string.Format("CreateNewItemTitle".GetLocalizedResource(), itemType),
 				SubtitleText = null,
 				DisplayControl = new Grid()
 				{
@@ -118,7 +118,7 @@ public static DynamicDialog GetFor_RenameDialog()
 				{
 					vm.HideDialog(); // Rename successful
 				},
-				PrimaryButtonText = "RenameDialog/PrimaryButtonText".GetLocalizedResource(),
+				PrimaryButtonText = "Create".GetLocalizedResource(),
 				CloseButtonText = "Cancel".GetLocalizedResource(),
 				DynamicButtonsEnabled = DynamicDialogButtons.Cancel,
 				DynamicButtons = DynamicDialogButtons.Primary | DynamicDialogButtons.Cancel

src/Files.App/Helpers/UI/UIFilesystemHelpers.cs

@@ -87,7 +87,7 @@ public static async Task CreateFileFromDialogResultTypeAsync(AddItemDialogItemTy
 			string? userInput = null;
 			if (itemType != AddItemDialogItemType.File || itemInfo?.Command is null)
 			{
-				DynamicDialog dialog = DynamicDialogFactory.GetFor_RenameDialog();
+				DynamicDialog dialog = DynamicDialogFactory.GetFor_CreateItemDialog(itemType.ToString().GetLocalizedResource());
 				await dialog.TryShowAsync(); // Show rename dialog
 
 				if (dialog.DynamicResult != DynamicDialogResult.Primary)

src/Files.App/Strings/en-US/Resources.resw

@@ -291,8 +291,8 @@
   <data name="EnterAnItemName" xml:space="preserve">
     <value>Enter an item name</value>
   </data>
-  <data name="RenameDialog.PrimaryButtonText" xml:space="preserve">
-    <value>Set name</value>
+  <data name="CreateNewItemTitle" xml:space="preserve">
+    <value>Create new {0}</value>
   </data>
   <data name="LightTheme" xml:space="preserve">
     <value>Light</value>

…wModels/Dialogs/RenameDialogViewModel.cs …els/Dialogs/CreateItemDialogViewModel.cssrc/Files.App/ViewModels/Dialogs/RenameDialogViewModel.cs renamed to src/Files.App/ViewModels/Dialogs/CreateItemDialogViewModel.cs src/Files.App/ViewModels/Dialogs/RenameDialogViewModel.cs renamed to src/Files.App/ViewModels/Dialogs/CreateItemDialogViewModel.cs

@@ -3,7 +3,7 @@
 
 namespace Files.App.ViewModels.Dialogs
 {
-    class RenameDialogViewModel : ObservableObject
+    class CreateItemDialogViewModel : ObservableObject
     {
 		private bool isNameInvalid;
 		public bool IsNameInvalid