Skip to content

Code Quality: Added 12px Sized Nav Icons & Updated Actions.Sync icon #15893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Code Quality: Added 12px Sized Nav Icons & Updated Actions.Sync icon #15893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/Files.App.Controls/ThemedIcon/Styles/Icons.Action.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,4 +274,27 @@
</Setter>
</Style>

<Style
x:Key="App.ThemedIcons.Actions.Sync"
BasedOn="{StaticResource DefaultThemedIconStyle}"
TargetType="local:ThemedIcon">


<Setter Property="IconSize" Value="16" />

<Setter Property="OutlineIconData" Value="m7.15.65c.2-.2.51-.2.71,0l1.5,1.5c.2.2.2.51,0,.71l-1.5,1.5c-.2.2-.51.2-.71,0-.2-.2-.2-.51,0-.71l.64-.64c-2.66.11-4.79,2.31-4.79,5,0,1.57.72,2.97,1.85,3.88.21.17.25.49.07.7-.17.21-.49.25-.7.07-1.35-1.1-2.22-2.78-2.22-4.66,0-3.25,2.58-5.89,5.8-6l-.65-.65c-.2-.2-.2-.51,0-.71Zm3.93,2.77c.17-.21.49-.25.7-.07,1.35,1.1,2.22,2.78,2.22,4.66,0,3.25-2.58,5.89-5.8,6l.65.65c.2.2.2.51,0,.71-.2.2-.51.2-.71,0l-1.5-1.5c-.09-.09-.15-.22-.15-.35s.05-.26.15-.35l1.5-1.5c.2-.2.51-.2.71,0,.2.2.2.51,0,.71l-.64.64c2.66-.11,4.79-2.3,4.79-5,0-1.57-.72-2.97-1.85-3.88-.21-.17-.25-.49-.07-.7Z" />
<Setter Property="FilledIconData" Value="m6.97.47c.29-.29.77-.29,1.06,0l1.75,1.75c.29.29.29.77,0,1.06l-1.75,1.75c-.29.29-.77.29-1.06,0-.29-.29-.29-.77,0-1.06l.43-.43c-2.2.29-3.9,2.18-3.9,4.46,0,1.39.63,2.63,1.62,3.46.32.27.36.74.1,1.06-.27.32-.74.36-1.06.1-1.32-1.1-2.16-2.76-2.16-4.61,0-3.13,2.4-5.7,5.46-5.98l-.49-.49c-.29-.29-.29-.77,0-1.06Zm3.82,3.02c.27-.32.74-.36,1.06-.1,1.32,1.1,2.16,2.76,2.16,4.61,0,3.13-2.4,5.7-5.46,5.98l.49.49c.29.29.29.77,0,1.06-.29.29-.77.29-1.06,0l-1.75-1.75c-.14-.14-.22-.33-.22-.53s.08-.39.22-.53l1.75-1.75c.29-.29.77-.29,1.06,0,.29.29.29.77,0,1.06l-.43.43c2.2-.29,3.9-2.18,3.9-4.46,0-1.39-.63-2.63-1.62-3.46-.32-.27-.36-.74-.1-1.06Z" />

<Setter Property="Layers">
<Setter.Value>
<local:ThemedIconLayers>
<local:ThemedIconLayer
LayerSize="16"
LayerType="Base"
PathData="m7.15.65c.2-.2.51-.2.71,0l1.5,1.5c.2.2.2.51,0,.71l-1.5,1.5c-.2.2-.51.2-.71,0-.2-.2-.2-.51,0-.71l.64-.64c-2.66.11-4.79,2.31-4.79,5,0,1.57.72,2.97,1.85,3.88.21.17.25.49.07.7-.17.21-.49.25-.7.07-1.35-1.1-2.22-2.78-2.22-4.66,0-3.25,2.58-5.89,5.8-6l-.65-.65c-.2-.2-.2-.51,0-.71Zm3.93,2.77c.17-.21.49-.25.7-.07,1.35,1.1,2.22,2.78,2.22,4.66,0,3.25-2.58,5.89-5.8,6l.65.65c.2.2.2.51,0,.71-.2.2-.51.2-.71,0l-1.5-1.5c-.09-.09-.15-.22-.15-.35s.05-.26.15-.35l1.5-1.5c.2-.2.51-.2.71,0,.2.2.2.51,0,.71l-.64.64c2.66-.11,4.79-2.3,4.79-5,0-1.57-.72-2.97-1.85-3.88-.21-.17-.25-.49-.07-.7Z" />
</local:ThemedIconLayers>
</Setter.Value>
</Setter>
</Style>

</ResourceDictionary>
103 changes: 103 additions & 0 deletions src/Files.App.Controls/ThemedIcon/Styles/Icons.Common.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:local="using:Files.App.Controls">


<!--#region Navigation 16px Icons-->
<Style
x:Key="App.ThemedIcons.NavForward"
BasedOn="{StaticResource DefaultThemedIconStyle}"
Expand Down Expand Up @@ -88,6 +89,108 @@
</Setter>
</Style>

<!--#endregion-->


<!--#region Navigation 12px Icons-->

<Style
x:Key="App.ThemedIcons.NavForward.12"
BasedOn="{StaticResource DefaultThemedIconStyle}"
TargetType="local:ThemedIcon">


<Setter Property="IconSize" Value="12" />

<Setter Property="OutlineIconData" Value="m10.2,6l-4.03,3.63c-.21.18-.22.5-.04.71.18.21.5.22.71.04l5-4.5c.11-.09.17-.23.17-.37s-.06-.28-.17-.37L6.83.63c-.21-.18-.52-.17-.71.04-.18.21-.17.52.04.71l4.03,3.63H.5C.22,5,0,5.22,0,5.5s.22.5.5.5h9.7Z" />
<Setter Property="FilledIconData" Value="m.75,4.75h8.54s-3.29-2.94-3.29-2.94c-.31-.28-.34-.75-.06-1.06.28-.31.75-.34,1.06-.06l4.75,4.25c.16.14.25.35.25.56s-.09.42-.25.56l-4.75,4.25c-.31.28-.78.25-1.06-.06-.28-.31-.25-.78.06-1.06l3.29-2.94H.75C.34,6.25,0,5.91,0,5.5s.34-.75.75-.75Z" />

<Setter Property="Layers">
<Setter.Value>
<local:ThemedIconLayers>
<local:ThemedIconLayer
LayerSize="12"
LayerType="Base"
PathData="m10.2,6l-4.03,3.63c-.21.18-.22.5-.04.71.18.21.5.22.71.04l5-4.5c.11-.09.17-.23.17-.37s-.06-.28-.17-.37L6.83.63c-.21-.18-.52-.17-.71.04-.18.21-.17.52.04.71l4.03,3.63H.5C.22,5,0,5.22,0,5.5s.22.5.5.5h9.7Z" />
</local:ThemedIconLayers>
</Setter.Value>
</Setter>
</Style>


<Style
x:Key="App.ThemedIcons.NavUp.12"
BasedOn="{StaticResource DefaultThemedIconStyle}"
TargetType="local:ThemedIcon">


<Setter Property="IconSize" Value="12" />

<Setter Property="OutlineIconData" Value="m5,11.5c0,.28.22.5.5.5s.5-.22.5-.5V1.8l3.63,4.03c.18.21.5.22.71.04.21-.18.22-.5.04-.71L5.87.17c-.09-.11-.23-.17-.37-.17s-.28.06-.37.17L.63,5.17c-.18.21-.17.52.04.71.21.18.52.17.71-.04L5,1.8v9.7Z" />
<Setter Property="FilledIconData" Value="m5.5,12c-.41,0-.75-.34-.75-.75V2.71l-2.94,3.29c-.28.31-.75.34-1.06.06-.31-.28-.34-.75-.06-1.06L4.94.25c.14-.16.35-.25.56-.25s.42.09.56.25l4.25,4.75c.28.31.25.78-.06,1.06-.31.28-.78.25-1.06-.06l-2.94-3.29v8.54c0,.41-.34.75-.75.75Z" />

<Setter Property="Layers">
<Setter.Value>
<local:ThemedIconLayers>
<local:ThemedIconLayer
LayerSize="12"
LayerType="Base"
PathData="m5,11.5c0,.28.22.5.5.5s.5-.22.5-.5V1.8l3.63,4.03c.18.21.5.22.71.04.21-.18.22-.5.04-.71L5.87.17c-.09-.11-.23-.17-.37-.17s-.28.06-.37.17L.63,5.17c-.18.21-.17.52.04.71.21.18.52.17.71-.04L5,1.8v9.7Z" />
</local:ThemedIconLayers>
</Setter.Value>
</Setter>
</Style>


<Style
x:Key="App.ThemedIcons.NavBack.12"
BasedOn="{StaticResource DefaultThemedIconStyle}"
TargetType="local:ThemedIcon">


<Setter Property="IconSize" Value="12" />

<Setter Property="OutlineIconData" Value="m11.5,6c.28,0,.5-.22.5-.5s-.22-.5-.5-.5H1.8L5.83,1.37c.21-.18.22-.5.04-.71-.18-.21-.5-.22-.71-.04L.17,5.13C.06,5.22,0,5.36,0,5.5s.06.28.17.37l5,4.5c.21.18.52.17.71-.04.18-.21.17-.52-.04-.71L1.8,6h9.7Z" />
<Setter Property="FilledIconData" Value="m12,5.5c0,.41-.34.75-.75.75H2.71s3.29,2.94,3.29,2.94c.31.28.34.75.06,1.06-.28.31-.75.34-1.06.06L.25,6.06C.09,5.92,0,5.71,0,5.5s.09-.42.25-.56L5,.69c.31-.28.78-.25,1.06.06.28.31.25.78-.06,1.06l-3.29,2.94h8.54c.41,0,.75.34.75.75Z" />

<Setter Property="Layers">
<Setter.Value>
<local:ThemedIconLayers>
<local:ThemedIconLayer
LayerSize="12"
LayerType="Base"
PathData="m11.5,6c.28,0,.5-.22.5-.5s-.22-.5-.5-.5H1.8L5.83,1.37c.21-.18.22-.5.04-.71-.18-.21-.5-.22-.71-.04L.17,5.13C.06,5.22,0,5.36,0,5.5s.06.28.17.37l5,4.5c.21.18.52.17.71-.04.18-.21.17-.52-.04-.71L1.8,6h9.7Z" />
</local:ThemedIconLayers>
</Setter.Value>
</Setter>
</Style>


<Style
x:Key="App.ThemedIcons.Refresh.12"
BasedOn="{StaticResource DefaultThemedIconStyle}"
TargetType="local:ThemedIcon">


<Setter Property="IconSize" Value="12" />

<Setter Property="OutlineIconData" Value="m1,6C1,3.24,3.24,1,6,1c1.64,0,3.09.78,4,2h-2c-.28,0-.5.22-.5.5s.22.5.5.5h2.89s.01,0,.02,0h.09c.28,0,.5-.22.5-.5V.5c0-.28-.22-.5-.5-.5s-.5.22-.5.5v1.53C9.4.79,7.79,0,6,0,2.69,0,0,2.69,0,6s2.69,6,6,6c3.13,0,5.7-2.4,5.98-5.46.02-.28-.18-.52-.45-.54-.28-.02-.52.18-.54.45-.23,2.55-2.37,4.54-4.98,4.54-2.76,0-5-2.24-5-5Z" />
<Setter Property="FilledIconData" Value="m1.5,6C1.5,3.51,3.51,1.5,6,1.5c1.33,0,2.53.58,3.35,1.5h-1.6c-.41,0-.75.34-.75.75s.34.75.75.75h3c.41,0,.75-.34.75-.75V.75c0-.41-.34-.75-.75-.75s-.75.34-.75.75v.78c-1.06-.95-2.46-1.53-4-1.53C2.69,0,0,2.69,0,6s2.69,6,6,6c3.02,0,5.53-2.24,5.94-5.15.06-.41-.23-.79-.64-.85-.41-.06-.79.23-.85.64-.31,2.18-2.19,3.86-4.45,3.86-2.49,0-4.5-2.01-4.5-4.5Z" />

<Setter Property="Layers">
<Setter.Value>
<local:ThemedIconLayers>
<local:ThemedIconLayer
LayerSize="12"
LayerType="Base"
PathData="m1,6C1,3.24,3.24,1,6,1c1.64,0,3.09.78,4,2h-2c-.28,0-.5.22-.5.5s.22.5.5.5h2.89s.01,0,.02,0h.09c.28,0,.5-.22.5-.5V.5c0-.28-.22-.5-.5-.5s-.5.22-.5.5v1.53C9.4.79,7.79,0,6,0,2.69,0,0,2.69,0,6s2.69,6,6,6c3.13,0,5.7-2.4,5.98-5.46.02-.28-.18-.52-.45-.54-.28-.02-.52.18-.54.45-.23,2.55-2.37,4.54-4.98,4.54-2.76,0-5-2.24-5-5Z" />
</local:ThemedIconLayers>
</Setter.Value>
</Setter>
</Style>

<!--#endregion-->


<Style
x:Key="App.ThemedIcons.Cut"
Expand Down