ui(AddShortcutForm): Reorder AddShortcutForm sections/fields for a more logical flow and consistent UX.

Author: Testudinidae

CmdPalWebSearchShortcut/WebSearchShortcut/Forms/AddShortcutForm.cs

@@ -57,32 +57,32 @@ public AddShortcutForm(WebSearchShortcutDataEntry? shortcut)
                     "title": {{JsonSerializer.Serialize(Resources.AddShortcutForm_SuggestionProvider_None, AppJsonSerializerContext.Default.String)}},
                     "value": ""
                 },
-                {{SuggestionsRegistry.ProviderNames.Select(key => $$"""
+{{SuggestionsRegistry.ProviderNames.Select(key => $$"""
                 {
                     "title": {{JsonSerializer.Serialize(key, AppJsonSerializerContext.Default.String)}},
                     "value": {{JsonSerializer.Serialize(key, AppJsonSerializerContext.Default.String)}}
                 }
-                """).Aggregate((a, b) => a + "," + b)}}
+""")
+    .Aggregate((a, b) => a + ",\n" + b)}}
             ],
             "value": {{JsonSerializer.Serialize(suggestionProvider, AppJsonSerializerContext.Default.String)}},
             "errorMessage": "// Just for space between items"
         },
         {
+            "id": "homePage",
             "type": "Input.Text",
-            "style": "text",
-            "id": "replaceWhitespace",
-            "label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_ReplaceWhitespace_Label, AppJsonSerializerContext.Default.String)}},
-            "placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_ReplaceWhitespace_Placeholder, AppJsonSerializerContext.Default.String)}},
-            "value": {{JsonSerializer.Serialize(replaceWhitespace, AppJsonSerializerContext.Default.String)}},
+            "style": "Url",
+            "label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_Homepage_Label, AppJsonSerializerContext.Default.String)}},
+            "placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_Homepage_Placeholder, AppJsonSerializerContext.Default.String)}},
+            "value": {{JsonSerializer.Serialize(homePage, AppJsonSerializerContext.Default.String)}},
             "errorMessage": "// Just for space between items"
         },
         {
+            "id": "replaceWhitespace",
             "type": "Input.Text",
-            "style": "text",
-            "id": "homePage",
-            "label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_Homepage_Label, AppJsonSerializerContext.Default.String)}},
-            "placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_Homepage_Placeholder, AppJsonSerializerContext.Default.String)}},
-            "value": {{JsonSerializer.Serialize(homePage, AppJsonSerializerContext.Default.String)}},
+            "label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_ReplaceWhitespace_Label, AppJsonSerializerContext.Default.String)}},
+            "placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_ReplaceWhitespace_Placeholder, AppJsonSerializerContext.Default.String)}},
+            "value": {{JsonSerializer.Serialize(replaceWhitespace, AppJsonSerializerContext.Default.String)}},
             "errorMessage": "// Just for space between items"
         },
         {
@@ -95,23 +95,22 @@ public AddShortcutForm(WebSearchShortcutDataEntry? shortcut)
                     "title": {{JsonSerializer.Serialize(Resources.AddShortcutForm_BrowserPath_Default, AppJsonSerializerContext.Default.String)}},
                     "value": ""
                 },
-                {{BrowserDiscovery.GetAllInstalledBrowsers()
-                        .Where(b => !string.IsNullOrWhiteSpace(b.Path))
-                        .Select(b => $$"""
-                        {
-                            "title": {{JsonSerializer.Serialize(b.Name, AppJsonSerializerContext.Default.String)}},
-                            "value": {{JsonSerializer.Serialize(b.Path, AppJsonSerializerContext.Default.String)}}
-                        }
-                        """)
-                        .Aggregate((a, b) => a + "," + b)}}
+{{BrowserDiscovery.GetAllInstalledBrowsers()
+    .Where(b => !string.IsNullOrWhiteSpace(b.Path))
+    .Select(b => $$"""
+                {
+                    "title": {{JsonSerializer.Serialize(b.Name, AppJsonSerializerContext.Default.String)}},
+                    "value": {{JsonSerializer.Serialize(b.Path, AppJsonSerializerContext.Default.String)}}
+                }
+""")
+    .Aggregate((a, b) => a + ",\n" + b)}}
             ],
             "value": {{JsonSerializer.Serialize(browserPath, AppJsonSerializerContext.Default.String)}},
             "errorMessage": "// Just for space between items"
         },
         {
             "id": "browserArgs",
             "type": "Input.Text",
-            "style": "text",
             "label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_BrowserArgs_Label, AppJsonSerializerContext.Default.String)}},
             "placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_BrowserArgs_Placeholder, AppJsonSerializerContext.Default.String)}},
             "value": {{JsonSerializer.Serialize(browserArgs, AppJsonSerializerContext.Default.String)}},

CmdPalWebSearchShortcut/WebSearchShortcut/WebSearchShortcutDataEntry.cs

@@ -12,9 +12,9 @@ internal sealed class WebSearchShortcutDataEntry
     public string Url { get; set; } = string.Empty;
     // public string[]? Urls { get; set; }
     public string? SuggestionProvider { get; set; }
-    public string? ReplaceWhitespace { get; set; }
-    public string? IconUrl { get; set; }
     public string? HomePage { get; set; }
+    public string? IconUrl { get; set; }
+    public string? ReplaceWhitespace { get; set; }
     public string? BrowserPath { get; set; }
     public string? BrowserArgs { get; set; }