Skip to content

Commit ea98909

Browse files
committed
ui(AddShortcutForm): Reorder AddShortcutForm sections/fields for a more logical flow and consistent UX.
1 parent 4ba9fba commit ea98909

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

CmdPalWebSearchShortcut/WebSearchShortcut/Forms/AddShortcutForm.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,32 +57,32 @@ public AddShortcutForm(WebSearchShortcutDataEntry? shortcut)
5757
"title": {{JsonSerializer.Serialize(Resources.AddShortcutForm_SuggestionProvider_None, AppJsonSerializerContext.Default.String)}},
5858
"value": ""
5959
},
60-
{{SuggestionsRegistry.ProviderNames.Select(key => $$"""
60+
{{SuggestionsRegistry.ProviderNames.Select(key => $$"""
6161
{
6262
"title": {{JsonSerializer.Serialize(key, AppJsonSerializerContext.Default.String)}},
6363
"value": {{JsonSerializer.Serialize(key, AppJsonSerializerContext.Default.String)}}
6464
}
65-
""").Aggregate((a, b) => a + "," + b)}}
65+
""")
66+
.Aggregate((a, b) => a + ",\n" + b)}}
6667
],
6768
"value": {{JsonSerializer.Serialize(suggestionProvider, AppJsonSerializerContext.Default.String)}},
6869
"errorMessage": "// Just for space between items"
6970
},
7071
{
72+
"id": "homePage",
7173
"type": "Input.Text",
72-
"style": "text",
73-
"id": "replaceWhitespace",
74-
"label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_ReplaceWhitespace_Label, AppJsonSerializerContext.Default.String)}},
75-
"placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_ReplaceWhitespace_Placeholder, AppJsonSerializerContext.Default.String)}},
76-
"value": {{JsonSerializer.Serialize(replaceWhitespace, AppJsonSerializerContext.Default.String)}},
74+
"style": "Url",
75+
"label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_Homepage_Label, AppJsonSerializerContext.Default.String)}},
76+
"placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_Homepage_Placeholder, AppJsonSerializerContext.Default.String)}},
77+
"value": {{JsonSerializer.Serialize(homePage, AppJsonSerializerContext.Default.String)}},
7778
"errorMessage": "// Just for space between items"
7879
},
7980
{
81+
"id": "replaceWhitespace",
8082
"type": "Input.Text",
81-
"style": "text",
82-
"id": "homePage",
83-
"label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_Homepage_Label, AppJsonSerializerContext.Default.String)}},
84-
"placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_Homepage_Placeholder, AppJsonSerializerContext.Default.String)}},
85-
"value": {{JsonSerializer.Serialize(homePage, AppJsonSerializerContext.Default.String)}},
83+
"label": {{JsonSerializer.Serialize(Resources.AddShortcutForm_ReplaceWhitespace_Label, AppJsonSerializerContext.Default.String)}},
84+
"placeholder": {{JsonSerializer.Serialize(Resources.AddShortcutForm_ReplaceWhitespace_Placeholder, AppJsonSerializerContext.Default.String)}},
85+
"value": {{JsonSerializer.Serialize(replaceWhitespace, AppJsonSerializerContext.Default.String)}},
8686
"errorMessage": "// Just for space between items"
8787
},
8888
{
@@ -95,15 +95,15 @@ public AddShortcutForm(WebSearchShortcutDataEntry? shortcut)
9595
"title": {{JsonSerializer.Serialize(Resources.AddShortcutForm_BrowserPath_Default, AppJsonSerializerContext.Default.String)}},
9696
"value": ""
9797
},
98-
{{BrowserDiscovery.GetAllInstalledBrowsers()
99-
.Where(b => !string.IsNullOrWhiteSpace(b.Path))
100-
.Select(b => $$"""
101-
{
102-
"title": {{JsonSerializer.Serialize(b.Name, AppJsonSerializerContext.Default.String)}},
103-
"value": {{JsonSerializer.Serialize(b.Path, AppJsonSerializerContext.Default.String)}}
104-
}
105-
""")
106-
.Aggregate((a, b) => a + "," + b)}}
98+
{{BrowserDiscovery.GetAllInstalledBrowsers()
99+
.Where(b => !string.IsNullOrWhiteSpace(b.Path))
100+
.Select(b => $$"""
101+
{
102+
"title": {{JsonSerializer.Serialize(b.Name, AppJsonSerializerContext.Default.String)}},
103+
"value": {{JsonSerializer.Serialize(b.Path, AppJsonSerializerContext.Default.String)}}
104+
}
105+
""")
106+
.Aggregate((a, b) => a + ",\n" + b)}}
107107
],
108108
"value": {{JsonSerializer.Serialize(browserPath, AppJsonSerializerContext.Default.String)}},
109109
"errorMessage": "// Just for space between items"

0 commit comments

Comments
 (0)