Skip to content

Commit bfc6ee1

Browse files
mdtaukmdtauk
authored
Code Quality: Added App Update and Updated icons for v4 (#17098)
1 parent bff7f99 commit bfc6ee1

File tree

2 files changed

+68
-1
lines changed

2 files changed

+68
-1
lines changed

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

+67
Original file line numberDiff line numberDiff line change
@@ -1205,6 +1205,72 @@
12051205
</Style>
12061206

12071207

1208+
<!-- V4 New Logo Icon -->
1209+
<Style
1210+
x:Key="App.ThemedIcons.v4.AppUpdateAvailable"
1211+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1212+
TargetType="local:ThemedIcon">
1213+
1214+
1215+
<Setter Property="IconSize" Value="16" />
1216+
1217+
<Setter Property="OutlineIconData" Value="m14.25,3h-6.75s-.02-.05-.03-.08c-.36-1.14-1.42-1.92-2.62-1.92h-2.1c-.97,0-1.75.78-1.75,1.75v4.51c.31-.25.64-.47,1-.66v-3.85c0-.41.34-.75.75-.75h2.1c.76,0,1.44.49,1.67,1.22.16.51.68,2.15,1.22,3.83.7.51,1.28,1.18,1.67,1.96-.5-1.58-1.17-3.68-1.59-5.02h1.68c.42,0,.8.27.94.66l1.96,5.54c.2.51.99.81,1.6.8.36,0,.7-.1,1-.28v.03c0,1.24-1.01,2.25-2.25,2.25h-.25c-1.1,0-2.1-.75-2.4-1.81,0,0-.06-.18-.16-.49.04.26.06.53.06.8,0,.44-.05.86-.15,1.27.07.08.14.15.21.23h-.27c-.1.35-.23.68-.39,1h3.35c1.79,0,3.25-1.46,3.25-3.25v-6c0-.97-.78-1.75-1.75-1.75Zm.75,6c0,.55-.46,1-1,1-.31,0-.7-.15-.8-.4l-1.82-5.28c-.04-.11-.09-.22-.15-.32h3.02c.41,0,.75.34.75.75v4.25Zm-10.5-2c-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.5-2.01-4.5-4.5-4.5Zm2.35,4.85l-2,2s-.1.08-.16.11c-.06.02-.12.04-.19.04h0c-.07,0-.13-.01-.19-.04-.06-.02-.11-.06-.16-.11h0s-2-2-2-2c-.2-.2-.2-.51,0-.71.2-.2.51-.2.71,0l1.15,1.15v-2.79c0-.28.22-.5.5-.5s.5.22.5.5v2.79l1.15-1.15c.2-.2.51-.2.71,0,.2.2.2.51,0,.71Z" />
1218+
<Setter Property="FilledIconData" Value="m4.5,7c-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.5-2.01-4.5-4.5-4.5Zm2.35,4.85l-2,2s-.1.08-.16.11c-.06.02-.12.04-.19.04h0c-.07,0-.13-.01-.19-.04-.06-.02-.11-.06-.16-.11l-2-2c-.2-.2-.2-.51,0-.71.2-.2.51-.2.71,0l1.15,1.15v-2.79c0-.28.22-.5.5-.5s.5.22.5.5v2.79l1.15-1.15c.2-.2.51-.2.71,0,.2.2.2.51,0,.71Zm3.17-.7h0s-.05-.16-.05-.16c.01.16.02.33.02.5,0,.9-.22,1.75-.6,2.5h1.92c-.11-.13-.21-.27-.31-.42-.48-.75-.75-1.71-.99-2.42Zm3.38-1.05c-.27-.38-.49-.86-.69-1.4l-.19-.55h0s-1.25-3.94-1.25-3.94c-.23-.73-.91-1.22-1.67-1.22h-1.11l2.48,7.84c.26.79.49,1.58.88,2.2.31.49.67.93,1.3.93,1.34,0,2.84-1.57,2.84-3.22v-.04c-.27.17-.61.29-1,.29-.71,0-1.22-.37-1.59-.9Zm.84-7.1h-2.52c.22.27.39.57.5.92l1.25,3.93.18.53c.18.49.36.88.56,1.15.25.35.49.48.78.48.31,0,.56-.15.73-.38.19-.24.27-.51.27-.62v-4.25c0-.97-.78-1.75-1.75-1.75ZM4.85,1h-2.1c-.97,0-1.75.78-1.75,1.75v4.51c.95-.79,2.17-1.26,3.5-1.26,2.04,0,3.82,1.11,4.77,2.76l-1.99-6.3c-.47-.89-1.4-1.46-2.43-1.46Z" />
1219+
1220+
<Setter Property="Layers">
1221+
<Setter.Value>
1222+
<local:ThemedIconLayers>
1223+
<local:ThemedIconLayer
1224+
LayerSize="16"
1225+
LayerType="Base"
1226+
PathData="m4.85,1c1.2,0,2.26.78,2.62,1.92,0,.03.02.05.03.08h0s6.75,0,6.75,0c.97,0,1.75.78,1.75,1.75v6c0,1.79-1.46,3.25-3.25,3.25h-3.35c.16-.32.29-.65.39-1h.27c-.07-.07-.14-.15-.21-.23.1-.41.15-.83.15-1.27,0-.27-.02-.54-.06-.8.1.31.16.49.16.49.3,1.07,1.3,1.81,2.4,1.81h0s.25,0,.25,0c1.24,0,2.25-1.01,2.25-2.25v-.03c-.3.17-.64.28-1,.28-.61,0-1.4-.29-1.6-.8l-1.96-5.54c-.14-.39-.52-.66-.94-.66h-1.68c.42,1.34,1.09,3.43,1.59,5.02-.4-.78-.97-1.45-1.67-1.96-.53-1.68-1.05-3.32-1.22-3.83-.23-.73-.91-1.22-1.67-1.22h-2.1c-.41,0-.75.34-.75.75v3.85c-.36.18-.69.4-1,.66V2.75c0-.97.78-1.75,1.75-1.75h2.1Zm6.38,3c.06.1.11.21.15.32l1.82,5.28c.1.25.49.4.8.4.54,0,1-.45,1-1v-4.25c0-.41-.34-.75-.75-.75h-3.02Z" />
1227+
<local:ThemedIconLayer
1228+
LayerSize="16"
1229+
LayerType="Accent"
1230+
PathData="m0,11.5c0,2.49,2.01,4.5,4.5,4.5s4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5S0,9.01,0,11.5Z" />
1231+
<local:ThemedIconLayer
1232+
LayerSize="16"
1233+
LayerType="AccentContrast"
1234+
PathData="m2.15,11.85l2,2h0s.1.08.16.11c.06.02.12.04.19.04h0c.07,0,.13-.01.19-.04.06-.02.11-.06.16-.11l2-2c.2-.2.2-.51,0-.71-.2-.2-.51-.2-.71,0l-1.15,1.15v-2.79c0-.28-.22-.5-.5-.5s-.5.22-.5.5v2.79l-1.15-1.15c-.2-.2-.51-.2-.71,0-.2.2-.2.51,0,.71Z" />
1235+
</local:ThemedIconLayers>
1236+
</Setter.Value>
1237+
</Setter>
1238+
</Style>
1239+
1240+
1241+
<!-- V4 New Logo Icon -->
1242+
<Style
1243+
x:Key="App.ThemedIcons.v4.AppUpdated"
1244+
BasedOn="{StaticResource DefaultThemedIconStyle}"
1245+
TargetType="local:ThemedIcon">
1246+
1247+
1248+
<Setter Property="IconSize" Value="16" />
1249+
1250+
<Setter Property="OutlineIconData" Value="m4.5,7C2.01,7,0,9.01,0,11.5s2.01,4.5,4.5,4.5,4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5Zm2.35,3.35l-3,3c-.2.2-.51.2-.71,0l-1-1c-.2-.2-.2-.51,0-.71.2-.2.51-.2.71,0l.65.65,2.65-2.65c.2-.2.51-.2.71,0s.2.51,0,.71Zm7.4-7.35h-6.75s-.02-.05-.03-.08c-.36-1.14-1.42-1.92-2.62-1.92h-2.1c-.97,0-1.75.78-1.75,1.75v4.51c.31-.25.64-.47,1-.66v-3.85c0-.41.34-.75.75-.75h2.1c.76,0,1.44.49,1.67,1.22.16.51.68,2.15,1.22,3.83.7.51,1.28,1.18,1.67,1.96-.5-1.58-1.17-3.68-1.59-5.02h1.68c.42,0,.8.27.94.66l1.96,5.54c.2.51.99.81,1.6.8.36,0,.7-.1,1-.28v.03c0,1.24-1.01,2.25-2.25,2.25h-.25c-1.1,0-2.1-.75-2.4-1.81,0,0-.06-.18-.16-.49.04.26.06.53.06.8,0,.44-.05.86-.15,1.27.07.08.14.15.21.23h-.27c-.1.35-.23.68-.39,1h3.35c1.79,0,3.25-1.46,3.25-3.25v-6c0-.97-.78-1.75-1.75-1.75Zm.75,6c0,.55-.46,1-1,1-.31,0-.7-.15-.8-.4l-1.82-5.28c-.04-.11-.09-.22-.15-.32h3.02c.41,0,.75.34.75.75v4.25Z" />
1251+
<Setter Property="FilledIconData" Value="m4.5,7C2.01,7,0,9.01,0,11.5s2.01,4.5,4.5,4.5,4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5Zm2.35,3.35l-3,3c-.2.2-.51.2-.71,0l-1-1c-.2-.2-.2-.51,0-.71.2-.2.51-.2.71,0l.65.65,2.65-2.65c.2-.2.51-.2.71,0s.2.51,0,.71Zm3.17.8h0s-.05-.16-.05-.16c.01.16.02.33.02.5,0,.9-.22,1.75-.6,2.5h1.92c-.11-.13-.21-.27-.31-.42-.48-.75-.75-1.71-.99-2.42Zm3.38-1.05c-.27-.38-.49-.86-.69-1.4l-.19-.55h0s-1.25-3.94-1.25-3.94c-.23-.73-.91-1.22-1.67-1.22h-1.11l2.48,7.84c.26.79.49,1.58.88,2.2.31.49.67.93,1.3.93,1.34,0,2.84-1.57,2.84-3.22v-.04c-.27.17-.61.29-1,.29-.71,0-1.22-.37-1.59-.9Zm.84-7.1h-2.52c.22.27.39.57.5.92l1.25,3.93.18.53c.18.49.36.88.56,1.15.25.35.49.48.78.48.31,0,.56-.15.73-.38.19-.24.27-.51.27-.62v-4.25c0-.97-.78-1.75-1.75-1.75ZM4.85,1h-2.1c-.97,0-1.75.78-1.75,1.75v4.51c.95-.79,2.17-1.26,3.5-1.26,2.04,0,3.82,1.11,4.77,2.76l-1.99-6.3c-.47-.89-1.4-1.46-2.43-1.46Z" />
1252+
1253+
<Setter Property="Layers">
1254+
<Setter.Value>
1255+
<local:ThemedIconLayers>
1256+
<local:ThemedIconLayer
1257+
LayerSize="16"
1258+
LayerType="Base"
1259+
PathData="m4.85,1c1.2,0,2.26.78,2.62,1.92,0,.03.02.05.03.08h0s6.75,0,6.75,0c.97,0,1.75.78,1.75,1.75v6c0,1.79-1.46,3.25-3.25,3.25h-3.35c.16-.32.29-.65.39-1h.27c-.07-.07-.14-.15-.21-.23.1-.41.15-.83.15-1.27,0-.27-.02-.54-.06-.8.1.31.16.49.16.49.3,1.07,1.3,1.81,2.4,1.81h0s.25,0,.25,0c1.24,0,2.25-1.01,2.25-2.25v-.03c-.3.17-.64.28-1,.28-.61,0-1.4-.29-1.6-.8l-1.96-5.54c-.14-.39-.52-.66-.94-.66h-1.68c.42,1.34,1.09,3.43,1.59,5.02-.4-.78-.97-1.45-1.67-1.96-.53-1.68-1.05-3.32-1.22-3.83-.23-.73-.91-1.22-1.67-1.22h-2.1c-.41,0-.75.34-.75.75v3.85c-.36.18-.69.4-1,.66V2.75c0-.97.78-1.75,1.75-1.75h2.1Zm6.38,3c.06.1.11.21.15.32l1.82,5.28c.1.25.49.4.8.4.54,0,1-.45,1-1v-4.25c0-.41-.34-.75-.75-.75h-3.02Z" />
1260+
<local:ThemedIconLayer
1261+
LayerSize="16"
1262+
LayerType="Accent"
1263+
PathData="m0,11.5c0,2.49,2.01,4.5,4.5,4.5s4.5-2.01,4.5-4.5-2.01-4.5-4.5-4.5S0,9.01,0,11.5Z" />
1264+
<local:ThemedIconLayer
1265+
LayerSize="16"
1266+
LayerType="AccentContrast"
1267+
PathData="m6.85,9.65c-.2-.2-.51-.2-.71,0l-2.65,2.65-.65-.65c-.2-.2-.51-.2-.71,0-.2.2-.2.51,0,.71l1,1c.2.2.51.2.71,0l3-3c.2-.2.2-.51,0-.71Z" />
1268+
</local:ThemedIconLayers>
1269+
</Setter.Value>
1270+
</Setter>
1271+
</Style>
1272+
1273+
12081274
<Style
12091275
x:Key="App.ThemedIcons.AppUpdated"
12101276
BasedOn="{StaticResource DefaultThemedIconStyle}"
@@ -1264,6 +1330,7 @@
12641330
</Setter>
12651331
</Style>
12661332

1333+
12671334
<!--#region Omnibar Icons-->
12681335

12691336
<Style

‎src/Files.App/UserControls/NavigationToolbar.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@
536536
Height="16"
537537
x:Load="{x:Bind ViewModel.IsUpdating, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
538538
IsFilled="True"
539-
Style="{StaticResource App.ThemedIcons.AppUpdateAvailable}" />
539+
Style="{StaticResource App.ThemedIcons.v4.AppUpdateAvailable}" />
540540

541541
<!-- Progress -->
542542
<ProgressRing

0 commit comments

Comments
 (0)