Created a markup extension for ThemedIcon (WIP)

Author: 0x5bfa

Settings.XamlStyler

@@ -1,3 +1,4 @@
 {
-  "IndentWithTabs":  true
+  "IndentWithTabs":  true,
+  "NoNewLineMarkupExtensions": "x:Bind, Binding, controls:ThemedIconMarkup",
 }

src/Files.App.Controls/ThemedIcon/ThemedIconMarkup.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml.Markup;
+
+namespace Files.App.Controls
+{
+	[MarkupExtensionReturnType(ReturnType = typeof(ThemedIcon))]
+	public sealed partial class ThemedIconMarkup : MarkupExtension
+	{
+		public Style Style { get; set; } = null!;
+
+		public bool IsFilled { get; set; }
+
+		public ThemedIconTypes IconType { get; set; }
+
+		protected override object ProvideValue()
+		{
+			return new ThemedIcon() { Style = Style, IsFilled = IsFilled, IconType = IconType };
+		}
+	}
+}

tests/Files.App.UITests/Views/OmnibarPage.xaml

@@ -22,16 +22,12 @@
 						TextChanged="Omnibar1_TextChanged">
 
 						<controls:OmnibarMode
+							IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
+							IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
 							IsDefault="True"
 							ModeName="Path"
 							PlaceholderText="Enter text..."
 							Text="Path...">
-							<controls:OmnibarMode.IconOnActive>
-								<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
-							</controls:OmnibarMode.IconOnActive>
-							<controls:OmnibarMode.IconOnInactive>
-								<controls:ThemedIcon IconType="Outline" Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
-							</controls:OmnibarMode.IconOnInactive>
 							<controls:OmnibarMode.ContentOnInactive>
 								<controls:BreadcrumbBar
 									x:Name="BreadcrumbBar1"
@@ -55,15 +51,11 @@
 
 						<controls:OmnibarMode
 							DisplayMemberPath="Title"
+							IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
+							IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
 							ModeName="Palette"
 							PlaceholderText="Enter a palette command..."
 							SuggestionItemsSource="{x:Bind Omnibar1_PaletteSuggestions, Mode=OneWay}">
-							<controls:OmnibarMode.IconOnActive>
-								<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
-							</controls:OmnibarMode.IconOnActive>
-							<controls:OmnibarMode.IconOnInactive>
-								<controls:ThemedIcon IconType="Outline" Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
-							</controls:OmnibarMode.IconOnInactive>
 							<controls:OmnibarMode.SuggestionItemTemplate>
 								<DataTemplate x:DataType="data:OmnibarPaletteSuggestionItem">
 									<Grid Height="48" ColumnSpacing="12">
@@ -99,14 +91,11 @@
 							</controls:OmnibarMode.SuggestionItemTemplate>
 						</controls:OmnibarMode>
 
-						<controls:OmnibarMode ModeName="Search" PlaceholderText="Enter a search query...">
-							<controls:OmnibarMode.IconOnActive>
-								<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
-							</controls:OmnibarMode.IconOnActive>
-							<controls:OmnibarMode.IconOnInactive>
-								<controls:ThemedIcon IconType="Outline" Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
-							</controls:OmnibarMode.IconOnInactive>
-						</controls:OmnibarMode>
+						<controls:OmnibarMode
+							IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IsFilled=True}"
+							IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IconType=Outline}"
+							ModeName="Search"
+							PlaceholderText="Enter a search query..." />
 
 					</controls:Omnibar>
 				</Grid>