Skip to content

Commit 832061f

Browse files
0x5bfamdtauk
0x5bfa
and
mdtauk
committed
Added Omnibar icons
Co-Authored-By: Martin Anderson <[email protected]>
1 parent 8a69fd7 commit 832061f

File tree

3 files changed

+120
-8
lines changed

3 files changed

+120
-8
lines changed

‎src/Files.App.Controls/Omnibar/Omnibar.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
using Microsoft.UI.Xaml.Media;
77
using Microsoft.UI.Xaml.Markup;
88
using Microsoft.UI.Xaml.Shapes;
9-
using System.Linq;
10-
using System.Collections.Generic;
119
using Microsoft.UI.Xaml.Input;
1210
using Microsoft.UI;
1311

‎src/Files.App.Controls/ThemedIcon/Styles/Icons.Common.xaml‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,4 +1264,118 @@
12641264
</Setter>
12651265
</Style>
12661266

1267+
<!--#region Omnibar Icons-->
1268+
1269+
<Style
1270+
x:Key="App.ThemedIcons.Omnibar.Path"
1271+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1272+
TargetType="local:ThemedIcon">
1273+
1274+
<Setter Property="IconSize" Value="16" />
1275+
1276+
<Setter Property="OutlineIconData" Value="m13,1.99H3C1.34,1.99,0,3.33,0,4.99v6c0,1.66,1.34,3,3,3h10c1.66,0,3-1.34,3-3v-6c0-1.66-1.34-3-3-3Zm2,9c0,1.1-.9,2-2,2H3c-1.1,0-2-.9-2-2v-6c0-1.1.9-2,2-2h10c1.1,0,2,.9,2,2v6ZM5.98,4.35c-.08-.27-.35-.42-.62-.34-.27.08-.42.35-.34.62l2,7c.08.27.35.42.62.34.27-.08.42-.35.34-.62l-2-7Zm-3,0c-.08-.27-.35-.42-.62-.34-.27.08-.42.35-.34.62l2,7c.08.27.35.42.62.34.27-.08.42-.35.34-.62l-2-7Zm9.77,6.14c-.41,0-.75.34-.75.75s.34.75.75.75.75-.34.75-.75-.34-.75-.75-.75Zm-2.5,0c-.41,0-.75.34-.75.75s.34.75.75.75.75-.34.75-.75-.34-.75-.75-.75Z" />
1277+
<Setter Property="FilledIconData" Value="m3,1.99C1.34,1.99,0,3.33,0,4.99v6c0,1.66,1.34,3,3,3h10c1.66,0,3-1.34,3-3v-6c0-1.66-1.34-3-3-3H3Zm.48,2.58c-.09-.4-.5-.66-.9-.56-.4.09-.66.5-.56.9l1.5,6.5c.09.4.5.66.9.56.4-.09.66-.5.56-.9l-1.5-6.5Zm6.77,7.42c.41,0,.75-.34.75-.75s-.34-.75-.75-.75-.75.34-.75.75.34.75.75.75Zm2.5,0c.41,0,.75-.34.75-.75s-.34-.75-.75-.75-.75.34-.75.75.34.75.75.75Zm-7.17-7.98c.4-.09.81.16.9.56l1.5,6.5c.09.4-.16.81-.56.9-.4.09-.81-.16-.9-.56l-1.5-6.5c-.09-.4.16-.81.56-.9Z" />
1278+
1279+
<Setter Property="Layers">
1280+
<Setter.Value>
1281+
<local:ThemedIconLayers>
1282+
<local:ThemedIconLayer
1283+
LayerSize="16"
1284+
LayerType="Base"
1285+
PathData="m0,4.99C0,3.33,1.34,1.99,3,1.99h10c1.66,0,3,1.34,3,3v6c0,1.66-1.34,3-3,3H3c-1.66,0-3-1.34-3-3v-6Zm3-2c-1.1,0-2,.9-2,2v6c0,1.1.9,2,2,2h10c1.1,0,2-.9,2-2v-6c0-1.1-.9-2-2-2H3Z" />
1286+
<local:ThemedIconLayer
1287+
LayerSize="16"
1288+
LayerType="Accent"
1289+
PathData="m2.98,4.35c-.08-.27-.35-.42-.62-.34-.27.08-.42.35-.34.62l2,7c.08.27.35.42.62.34.27-.08.42-.35.34-.62l-2-7Zm3,0c-.08-.27-.35-.42-.62-.34-.27.08-.42.35-.34.62l2,7c.08.27.35.42.62.34.27-.08.42-.35.34-.62l-2-7Zm4.27,6.14c-.41,0-.75.34-.75.75s.34.75.75.75.75-.34.75-.75-.34-.75-.75-.75Zm2.5,0c-.41,0-.75.34-.75.75s.34.75.75.75.75-.34.75-.75-.34-.75-.75-.75Z" />
1290+
</local:ThemedIconLayers>
1291+
</Setter.Value>
1292+
</Setter>
1293+
</Style>
1294+
1295+
<Style
1296+
x:Key="App.ThemedIcons.Omnibar.Commands"
1297+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1298+
TargetType="local:ThemedIcon">
1299+
1300+
<Setter Property="IconSize" Value="16" />
1301+
1302+
<Setter Property="OutlineIconData" Value="m11.49,2.99c-.28,0-.5.22-.5.5v9c0,.28.22.5.5.5s.5-.22.5-.5V3.49c0-.28-.22-.5-.5-.5Zm-7.14.14c-.11-.09-.22-.13-.35-.13-.15,0-.27.04-.35.13-.11.11-.16.22-.16.35,0,.15.04.27.13.35l4.16,4.16-4.16,4.16c-.09.09-.13.19-.13.32,0,.15.04.28.13.38.11.09.23.13.38.13.13,0,.25-.04.35-.13l4.48-4.51c.11-.11.16-.22.16-.35s-.05-.25-.16-.35L4.35,3.13Z" />
1303+
<Setter Property="FilledIconData" Value="m4.78,3.26c-.13-.15-.3-.23-.51-.26-.21,0-.39.07-.54.22-.15.15-.22.32-.22.51,0,.21.06.39.19.54l3.52,3.74-3.52,3.74c-.13.15-.19.32-.19.51,0,.21.07.39.22.54s.33.21.54.19c.21,0,.38-.07.51-.22l4.03-4.26c.13-.15.19-.32.19-.51s-.07-.36-.22-.51L4.78,3.26Zm7.47-.26c-.41,0-.75.34-.75.75v8.5c0,.41.34.75.75.75s.75-.34.75-.75V3.75c0-.41-.34-.75-.75-.75Z" />
1304+
1305+
<Setter Property="Layers">
1306+
<Setter.Value>
1307+
<local:ThemedIconLayers>
1308+
<local:ThemedIconLayer
1309+
LayerSize="16"
1310+
LayerType="Base"
1311+
PathData="m11.49,2.99c-.28,0-.5.22-.5.5v9c0,.28.22.5.5.5s.5-.22.5-.5V3.49c0-.28-.22-.5-.5-.5Z" />
1312+
<local:ThemedIconLayer
1313+
LayerSize="16"
1314+
LayerType="Accent"
1315+
PathData="m3.49,12.47c0,.15.04.28.13.38.11.09.23.13.38.13.13,0,.25-.04.35-.13l4.48-4.51c.11-.11.16-.22.16-.35s-.05-.25-.16-.35L4.35,3.13c-.11-.09-.22-.13-.35-.13-.15,0-.27.04-.35.13-.11.11-.16.22-.16.35,0,.15.04.27.13.35l4.16,4.16-4.16,4.16c-.09.09-.13.19-.13.32Z" />
1316+
</local:ThemedIconLayers>
1317+
</Setter.Value>
1318+
</Setter>
1319+
</Style>
1320+
1321+
<Style
1322+
x:Key="App.ThemedIcons.Omnibar.Search"
1323+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1324+
TargetType="local:ThemedIcon">
1325+
1326+
<Setter Property="IconSize" Value="16" />
1327+
1328+
<Setter Property="OutlineIconData" Value="m6.5.99c3.04,0,5.5,2.46,5.5,5.5,0,1.34-.48,2.57-1.27,3.52l4.13,4.13c.2.2.2.51,0,.71-.17.17-.44.19-.64.06l-.07-.06-4.13-4.13c-.95.8-2.18,1.27-3.52,1.27-3.04,0-5.5-2.46-5.5-5.5S3.46.99,6.5.99Zm0,1c-2.49,0-4.5,2.01-4.5,4.5s2.01,4.5,4.5,4.5,4.5-2.01,4.5-4.5S8.99,1.99,6.5,1.99Z" />
1329+
<Setter Property="FilledIconData" Value="m6.5.99c3.04,0,5.5,2.46,5.5,5.5,0,1.25-.42,2.4-1.12,3.32l4.15,4.15c.29.29.29.77,0,1.06-.27.27-.68.29-.98.07l-.08-.07-4.15-4.15c-.92.7-2.07,1.12-3.32,1.12-3.04,0-5.5-2.46-5.5-5.5S3.46.99,6.5.99Zm0,1.5c-2.21,0-4,1.79-4,4s1.79,4,4,4,4-1.79,4-4-1.79-4-4-4Z" />
1330+
1331+
<Setter Property="Layers">
1332+
<Setter.Value>
1333+
<local:ThemedIconLayers>
1334+
<local:ThemedIconLayer
1335+
LayerSize="16"
1336+
LayerType="Alt"
1337+
Opacity="0.5"
1338+
PathData="m11.5,6.49c0,2.76-2.24,5-5,5S1.5,9.25,1.5,6.49,3.74,1.49,6.5,1.49s5,2.24,5,5Z" />
1339+
<local:ThemedIconLayer
1340+
LayerSize="16"
1341+
LayerType="Base"
1342+
PathData="m6.5.99c3.04,0,5.5,2.46,5.5,5.5,0,1.34-.48,2.57-1.27,3.52l4.13,4.13c.2.2.2.51,0,.71-.17.17-.44.19-.64.06l-.07-.06-4.13-4.13c-.95.8-2.18,1.27-3.52,1.27-3.04,0-5.5-2.46-5.5-5.5S3.46.99,6.5.99Zm0,1c-2.49,0-4.5,2.01-4.5,4.5s2.01,4.5,4.5,4.5,4.5-2.01,4.5-4.5S8.99,1.99,6.5,1.99Z" />
1343+
</local:ThemedIconLayers>
1344+
</Setter.Value>
1345+
</Setter>
1346+
</Style>
1347+
1348+
<Style
1349+
x:Key="App.ThemedIcons.Omnibar.Search.Advanced"
1350+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1351+
TargetType="local:ThemedIcon">
1352+
1353+
<Setter Property="IconSize" Value="16" />
1354+
1355+
<Setter Property="OutlineIconData" Value="m15.85,13.15l-4.13-4.13c.8-.95,1.27-2.18,1.27-3.52,0-3.04-2.46-5.5-5.5-5.5S2,2.46,2,5.5c0,.36.03.71.1,1.05.3-.15.62-.27.95-.36-.03-.23-.05-.46-.05-.69C3,3.01,5.01,1,7.5,1s4.5,2.01,4.5,4.5c0,1.72-.97,3.22-2.39,3.97.12.31.22.64.29.98.4-.2.78-.44,1.12-.72l4.13,4.13.07.06c.19.14.46.12.64-.06.2-.2.2-.51,0-.71Zm-7.39-2.28c-1.12-.26-1.79-1.42-1.46-2.52l.13-.42c-.26-.2-.54-.38-.83-.52l-.32.34c-.79.84-2.12.84-2.91,0l-.34-.36c-.29.13-.57.3-.82.5l.16.56c.3,1.08-.34,2.2-1.43,2.48l-.46.12c-.01.15-.02.31-.02.46,0,.19.01.37.03.55l.35.08c1.12.26,1.79,1.42,1.46,2.52l-.13.42c.26.2.54.38.83.52l.32-.34c.79-.84,2.12-.84,2.91,0l.34.36c.29-.13.57-.3.82-.5l-.16-.56c-.3-1.08.34-2.2,1.43-2.48l.46-.12c.02-.15.02-.31.02-.46,0-.19-.01-.37-.03-.55l-.35-.08Zm-3.97,1.64c-.55,0-1-.45-1-1s.45-1,1-1,1,.45,1,1-.45,1-1,1Z" />
1356+
<Setter Property="FilledIconData" Value="m15.78,12.97l-4.15-4.15c.7-.92,1.12-2.07,1.12-3.32,0-3.04-2.46-5.5-5.5-5.5S1.75,2.46,1.75,5.5c0,.36.03.71.1,1.05.45-.22.93-.38,1.44-.47-.03-.19-.04-.39-.04-.58,0-2.21,1.79-4,4-4s4,1.79,4,4c0,1.52-.85,2.84-2.09,3.52.23.45.39.93.49,1.43.33-.16.64-.35.92-.57l4.15,4.15.08.07c.29.22.71.19.98-.07.29-.29.29-.77,0-1.06Zm-7.46-2.11c-1.12-.26-1.79-1.42-1.46-2.52l.13-.42c-.26-.2-.54-.38-.83-.52l-.32.34c-.79.84-2.12.84-2.91,0l-.34-.36c-.29.13-.57.3-.82.5l.16.56c.3,1.08-.34,2.2-1.43,2.48l-.46.12c-.01.15-.02.31-.02.46,0,.19.01.37.03.55l.35.08c1.12.26,1.79,1.42,1.46,2.52l-.13.42c.26.2.54.38.83.52l.32-.34c.79-.84,2.12-.84,2.91,0l.34.36c.29-.13.57-.3.82-.5l-.16-.56c-.3-1.08.34-2.2,1.43-2.48l.46-.12c.01-.15.02-.31.02-.46,0-.19-.01-.37-.03-.55l-.35-.08Zm-3.97,1.64c-.55,0-1-.45-1-1s.45-1,1-1,1,.45,1,1-.45,1-1,1Z" />
1357+
1358+
<Setter Property="Layers">
1359+
<Setter.Value>
1360+
<local:ThemedIconLayers>
1361+
<local:ThemedIconLayer
1362+
LayerSize="16"
1363+
LayerType="Alt"
1364+
Opacity="0.5"
1365+
PathData="m9.78,9.95c1.62-.83,2.72-2.51,2.72-4.45,0-2.76-2.24-5-5-5S2.5,2.74,2.5,5.5c0,.29.02.57.07.85.6-.22,1.25-.35,1.93-.35,2.5,0,4.61,1.67,5.28,3.95Z" />
1366+
<local:ThemedIconLayer
1367+
LayerSize="16"
1368+
LayerType="Base"
1369+
PathData="m7.5,0c3.04,0,5.5,2.46,5.5,5.5,0,1.34-.48,2.57-1.27,3.52l4.13,4.13c.2.2.2.51,0,.71-.17.17-.44.19-.64.06l-.07-.06-4.13-4.13c-.34.28-.72.53-1.12.72-.07-.34-.16-.66-.29-.98,1.42-.76,2.39-2.25,2.39-3.97,0-2.49-2.01-4.5-4.5-4.5S3,3.01,3,5.5c0,.24.02.47.05.69-.33.09-.65.21-.95.36-.07-.34-.1-.69-.1-1.05C2,2.46,4.46,0,7.5,0Z" />
1370+
<local:ThemedIconLayer
1371+
LayerSize="16"
1372+
LayerType="Accent"
1373+
PathData="m2.06,8.44c.3,1.08-.34,2.2-1.43,2.48l-.46.12c-.01.15-.02.31-.02.46,0,.19.01.37.03.55l.35.08c1.12.26,1.79,1.42,1.46,2.52l-.13.42c.26.2.54.38.83.52l.33-.34c.79-.84,2.12-.84,2.91,0l.34.36c.29-.13.57-.3.82-.5l-.16-.56c-.3-1.08.34-2.2,1.43-2.48l.46-.12c.01-.15.02-.31.02-.46,0-.19-.01-.37-.03-.55l-.35-.08c-1.12-.26-1.79-1.42-1.46-2.52l.13-.42c-.26-.2-.54-.38-.83-.52l-.32.34c-.79.84-2.12.84-2.91,0l-.34-.36c-.29.13-.57.3-.82.5l.16.56Zm2.43,4.06c-.55,0-1-.45-1-1s.45-1,1-1,1,.45,1,1-.45,1-1,1Z" />
1374+
</local:ThemedIconLayers>
1375+
</Setter.Value>
1376+
</Setter>
1377+
</Style>
1378+
1379+
<!--#endregion-->
1380+
12671381
</ResourceDictionary>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@
7373
Width="16"
7474
Height="16"
7575
IsFilled="True"
76-
Style="{StaticResource App.ThemedIcons.Settings}" />
76+
Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
7777
</controls:OmnibarMode.IconOnActive>
7878
<controls:OmnibarMode.IconOnInactive>
7979
<controls:ThemedIcon
8080
Width="16"
8181
Height="16"
82-
Style="{StaticResource App.ThemedIcons.Settings}" />
82+
Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
8383
</controls:OmnibarMode.IconOnInactive>
8484
</controls:OmnibarMode>
8585
<controls:OmnibarMode HideContentOnInactive="True" Text="B">
@@ -88,13 +88,13 @@
8888
Width="16"
8989
Height="16"
9090
IsFilled="True"
91-
Style="{StaticResource App.ThemedIcons.Settings}" />
91+
Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
9292
</controls:OmnibarMode.IconOnActive>
9393
<controls:OmnibarMode.IconOnInactive>
9494
<controls:ThemedIcon
9595
Width="16"
9696
Height="16"
97-
Style="{StaticResource App.ThemedIcons.Settings}" />
97+
Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
9898
</controls:OmnibarMode.IconOnInactive>
9999
</controls:OmnibarMode>
100100
<controls:OmnibarMode Text="C">
@@ -103,13 +103,13 @@
103103
Width="16"
104104
Height="16"
105105
IsFilled="True"
106-
Style="{StaticResource App.ThemedIcons.Settings}" />
106+
Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
107107
</controls:OmnibarMode.IconOnActive>
108108
<controls:OmnibarMode.IconOnInactive>
109109
<controls:ThemedIcon
110110
Width="16"
111111
Height="16"
112-
Style="{StaticResource App.ThemedIcons.Settings}" />
112+
Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
113113
</controls:OmnibarMode.IconOnInactive>
114114
</controls:OmnibarMode>
115115
</controls:Omnibar>

0 commit comments

Comments
 (0)