Skip to content

Commit 5bb2a34

Browse files
yaira2yaira2
committed
Feature: Add selection states to new icon sizes
1 parent 4e83029 commit 5bb2a34

File tree

1 file changed

+116
-20
lines changed

1 file changed

+116
-20
lines changed

‎src/Files.App/ResourceDictionaries/PathIcons.xaml

Lines changed: 116 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,31 +1950,49 @@
19501950
VerticalAlignment="Center">
19511951
<Path
19521952
Name="Path1"
1953+
Data="M5 2.75H7C7.69036 2.75 8.25 3.30964 8.25 4V6C8.25 6.69036 7.69036 7.25 7 7.25H5C4.30964 7.25 3.75 6.69036 3.75 6V4C3.75 3.30964 4.30964 2.75 5 2.75Z"
1954+
Fill="{ThemeResource Local.AccentContrastFillColorBrush}"
1955+
Opacity=".80" />
1956+
1957+
<Path
1958+
Name="Path2"
1959+
Data="M7 11.75H5C4.30964 11.75 3.75 12.3096 3.75 13V15C3.75 15.6904 4.30964 16.25 5 16.25H7C7.69036 16.25 8.25 15.6904 8.25 15V13C8.25 12.3096 7.69036 11.75 7 11.75Z"
1960+
Fill="{ThemeResource Local.AccentContrastFillColorBrush}"
1961+
Opacity=".80" />
1962+
1963+
<Path
1964+
Name="Path3"
1965+
Data="M5 20.75H7C7.69036 20.75 8.25 21.3096 8.25 22V24C8.25 24.6904 7.69036 25.25 7 25.25H5C4.30964 25.25 3.75 24.6904 3.75 24V22C3.75 21.3096 4.30964 20.75 5 20.75Z"
1966+
Fill="{ThemeResource Local.AccentContrastFillColorBrush}"
1967+
Opacity=".80" />
1968+
1969+
<Path
1970+
Name="Path4"
19531971
Data="M5 2C3.89543 2 3 2.89543 3 4V6C3 7.10457 3.89543 8 5 8H7C8.10457 8 9 7.10457 9 6V4C9 2.89543 8.10457 2 7 2H5ZM7 3.5H5C4.72386 3.5 4.5 3.72386 4.5 4V6C4.5 6.27614 4.72386 6.5 5 6.5H7C7.27614 6.5 7.5 6.27614 7.5 6V4C7.5 3.72386 7.27614 3.5 7 3.5Z"
19541972
Fill="{ThemeResource Local.IconBaseBrush}" />
19551973

19561974
<Path
1957-
Name="Path2"
1975+
Name="Path5"
19581976
Data="M3 13C3 11.8954 3.89543 11 5 11H7C8.10457 11 9 11.8954 9 13V15C9 16.1046 8.10457 17 7 17H5C3.89543 17 3 16.1046 3 15V13ZM5 12.5H7C7.27614 12.5 7.5 12.7239 7.5 13V15C7.5 15.2761 7.27614 15.5 7 15.5H5C4.72386 15.5 4.5 15.2761 4.5 15V13C4.5 12.7239 4.72386 12.5 5 12.5Z"
19591977
Fill="{ThemeResource Local.IconBaseBrush}" />
19601978

19611979
<Path
1962-
Name="Path3"
1980+
Name="Path6"
19631981
Data="M3 22C3 20.8954 3.89543 20 5 20H7C8.10457 20 9 20.8954 9 22V24C9 25.1046 8.10457 26 7 26H5C3.89543 26 3 25.1046 3 24V22ZM5 21.5H7C7.27614 21.5 7.5 21.7239 7.5 22V24C7.5 24.2761 7.27614 24.5 7 24.5H5C4.72386 24.5 4.5 24.2761 4.5 24V22C4.5 21.7239 4.72386 21.5 5 21.5Z"
19641982
Fill="{ThemeResource Local.IconBaseBrush}" />
19651983

19661984
<Path
1967-
Name="Path4"
1985+
Name="Path7"
19681986
Data="M12.75 4C12.3358 4 12 4.33579 12 4.75C12 5.16421 12.3358 5.5 12.75 5.5H24.25C24.6642 5.5 25 5.16421 25 4.75C25 4.33579 24.6642 4 24.25 4H12.75Z"
19691987
Fill="{ThemeResource Local.IconBaseBrush}" />
19701988

19711989
<Path
1972-
Name="Path5"
1990+
Name="Path8"
19731991
Data="M12 13.75C12 13.3358 12.3358 13 12.75 13H24.25C24.6642 13 25 13.3358 25 13.75C25 14.1642 24.6642 14.5 24.25 14.5H12.75C12.3358 14.5 12 14.1642 12 13.75Z"
19741992
Fill="{ThemeResource Local.IconBaseBrush}" />
19751993

19761994
<Path
1977-
Name="Path6"
1995+
Name="Path9"
19781996
Data="M12.75 22C12.3358 22 12 22.3358 12 22.75C12 23.1642 12.3358 23.5 12.75 23.5H24.25C24.6642 23.5 25 23.1642 25 22.75C25 22.3358 24.6642 22 24.25 22H12.75Z"
19791997
Fill="{ThemeResource Local.IconBaseBrush}" />
19801998
</Canvas>
@@ -1985,7 +2003,15 @@
19852003
<VisualState x:Name="Disabled" />
19862004
<VisualState x:Name="Selected">
19872005
<VisualState.Setters>
1988-
<Setter Target="Path1.Fill" Value="{ThemeResource Local.AccentContrastFillColorBrush}" />
2006+
<Setter Target="Path1.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2007+
<Setter Target="Path2.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2008+
<Setter Target="Path3.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2009+
<Setter Target="Path4.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2010+
<Setter Target="Path5.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2011+
<Setter Target="Path6.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2012+
<Setter Target="Path7.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2013+
<Setter Target="Path8.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2014+
<Setter Target="Path9.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
19892015
</VisualState.Setters>
19902016
</VisualState>
19912017
</VisualStateGroup>
@@ -2008,21 +2034,33 @@
20082034
VerticalAlignment="Center">
20092035
<Path
20102036
Name="Path1"
2037+
Data="M6.25 8C5.55964 8 5 8.55964 5 9.25V12.75C5 13.4404 5.55964 14 6.25 14H9.75C10.4404 14 11 13.4404 11 12.75V9.25C11 8.55964 10.4404 8 9.75 8H6.25Z"
2038+
Fill="{ThemeResource Local.AccentContrastFillColorBrush}"
2039+
Opacity=".80" />
2040+
2041+
<Path
2042+
Name="Path2"
2043+
Data="M18.25 8C17.5596 8 17 8.55964 17 9.25V12.75C17 13.4404 17.5596 14 18.25 14H21.75C22.4404 14 23 13.4404 23 12.75V9.25C23 8.55964 22.4404 8 21.75 8H18.25Z"
2044+
Fill="{ThemeResource Local.AccentContrastFillColorBrush}"
2045+
Opacity=".80" />
2046+
2047+
<Path
2048+
Name="Path3"
20112049
Data="M12 9.25C12 8.00736 10.9926 7 9.75 7H6.25C5.00736 7 4 8.00736 4 9.25V12.75C4 13.9926 5.00736 15 6.25 15H9.75C10.9926 15 12 13.9926 12 12.75V9.25ZM6.25 8.5H9.75C10.1642 8.5 10.5 8.83579 10.5 9.25V12.75C10.5 13.1642 10.1642 13.5 9.75 13.5H6.25C5.83579 13.5 5.5 13.1642 5.5 12.75V9.25C5.5 8.83579 5.83579 8.5 6.25 8.5Z"
20122050
Fill="{ThemeResource Local.IconBaseBrush}" />
20132051

20142052
<Path
2015-
Name="Path2"
2053+
Name="Path4"
20162054
Data="M24 9.25C24 8.00736 22.9926 7 21.75 7H18.25C17.0074 7 16 8.00736 16 9.25V12.75C16 13.9926 17.0074 15 18.25 15H21.75C22.9926 15 24 13.9926 24 12.75V9.25ZM18.25 8.5H21.75C22.1642 8.5 22.5 8.83579 22.5 9.25V12.75C22.5 13.1642 22.1642 13.5 21.75 13.5H18.25C17.8358 13.5 17.5 13.1642 17.5 12.75V9.25C17.5 8.83579 17.8358 8.5 18.25 8.5Z"
20172055
Fill="{ThemeResource Local.IconBaseBrush}" />
20182056

20192057
<Path
2020-
Name="Path3"
2058+
Name="Path5"
20212059
Data="M3 19.25C3 18.8358 3.33579 18.5 3.75 18.5H12.25C12.6642 18.5 13 18.8358 13 19.25C13 19.6642 12.6642 20 12.25 20H3.75C3.33579 20 3 19.6642 3 19.25Z"
20222060
Fill="{ThemeResource Local.IconBaseBrush}" />
20232061

20242062
<Path
2025-
Name="Path4"
2063+
Name="Path6"
20262064
Data="M15.75 18.5C15.3358 18.5 15 18.8358 15 19.25C15 19.6642 15.3358 20 15.75 20H24.25C24.6642 20 25 19.6642 25 19.25C25 18.8358 24.6642 18.5 24.25 18.5H15.75Z"
20272065
Fill="{ThemeResource Local.IconBaseBrush}" />
20282066
</Canvas>
@@ -2033,7 +2071,12 @@
20332071
<VisualState x:Name="Disabled" />
20342072
<VisualState x:Name="Selected">
20352073
<VisualState.Setters>
2036-
<Setter Target="Path1.Fill" Value="{ThemeResource Local.AccentContrastFillColorBrush}" />
2074+
<Setter Target="Path1.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2075+
<Setter Target="Path2.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2076+
<Setter Target="Path3.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2077+
<Setter Target="Path4.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2078+
<Setter Target="Path5.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2079+
<Setter Target="Path6.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
20372080
</VisualState.Setters>
20382081
</VisualState>
20392082
</VisualStateGroup>
@@ -2056,21 +2099,33 @@
20562099
VerticalAlignment="Center">
20572100
<Path
20582101
Name="Path1"
2102+
Data="M10.5 5.5C9.94772 5.5 9.5 5.94771 9.5 6.5V13.068C9.5 13.2703 9.62182 13.4526 9.80866 13.53C9.9955 13.6074 10.2106 13.5646 10.3536 13.4216L12.7626 11.0126C13.446 10.3291 14.554 10.3291 15.2374 11.0126L17.6464 13.4216C17.7894 13.5646 18.0045 13.6074 18.1913 13.53C18.3782 13.4526 18.5 13.2703 18.5 13.068V6.5C18.5 5.94772 18.0523 5.5 17.5 5.5H10.5Z"
2103+
Fill="{ThemeResource Local.AccentContrastFillColorBrush}"
2104+
Opacity=".80" />
2105+
2106+
<Path
2107+
Name="Path2"
2108+
Data="M17.1643 13.6464L14.884 11.3661C14.3959 10.878 13.6044 10.878 13.1162 11.3661L10.8359 13.6464C10.6929 13.7894 10.6501 14.0045 10.7275 14.1913C10.8049 14.3782 10.9872 14.5 11.1895 14.5H16.8108C17.013 14.5 17.1953 14.3782 17.2727 14.1913C17.3501 14.0045 17.3073 13.7894 17.1643 13.6464Z"
2109+
Fill="{ThemeResource Local.IconBaseBrush}"
2110+
Opacity=".30" />
2111+
2112+
<Path
2113+
Name="Path3"
20592114
Data="M16 7C15.4477 7 15 7.44772 15 8C15 8.55228 15.4477 9 16 9C16.5523 9 17 8.55228 17 8C17 7.44772 16.5523 7 16 7Z"
20602115
Fill="{ThemeResource Local.IconBaseBrush}" />
20612116

20622117
<Path
2063-
Name="Path2"
2118+
Name="Path4"
20642119
Data="M8.5 6.25C8.5 5.2835 9.2835 4.5 10.25 4.5H17.75C18.7165 4.5 19.5 5.2835 19.5 6.25V13.75C19.5 14.7165 18.7165 15.5 17.75 15.5H10.25C9.2835 15.5 8.5 14.7165 8.5 13.75V6.25ZM12.409 10.659L10 13.068V6.5C10 6.22386 10.2239 6 10.5 6H17.5C17.7761 6 18 6.22386 18 6.5V13.068L15.591 10.659C14.7123 9.78033 13.2877 9.78033 12.409 10.659ZM14.5303 11.7197L16.8107 14H11.1893L13.4697 11.7197C13.7626 11.4268 14.2374 11.4268 14.5303 11.7197Z"
20652120
Fill="{ThemeResource Local.IconBaseBrush}" />
20662121

20672122
<Path
2068-
Name="Path3"
2123+
Name="Path5"
20692124
Data="M6.75 18C6.33579 18 6 18.3358 6 18.75C6 19.1642 6.33579 19.5 6.75 19.5H21.25C21.6642 19.5 22 19.1642 22 18.75C22 18.3358 21.6642 18 21.25 18H6.75Z"
20702125
Fill="{ThemeResource Local.IconBaseBrush}" />
20712126

20722127
<Path
2073-
Name="Path4"
2128+
Name="Path6"
20742129
Data="M8 22.75C8 22.3358 8.33579 22 8.75 22H19.25C19.6642 22 20 22.3358 20 22.75C20 23.1642 19.6642 23.5 19.25 23.5H8.75C8.33579 23.5 8 23.1642 8 22.75Z"
20752130
Fill="{ThemeResource Local.IconBaseBrush}" />
20762131
</Canvas>
@@ -2081,7 +2136,13 @@
20812136
<VisualState x:Name="Disabled" />
20822137
<VisualState x:Name="Selected">
20832138
<VisualState.Setters>
2084-
<Setter Target="Path1.Fill" Value="{ThemeResource Local.AccentContrastFillColorBrush}" />
2139+
<Setter Target="Path1.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2140+
<Setter Target="Path2.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2141+
<Setter Target="Path2.Opacity" Value=".20" />
2142+
<Setter Target="Path3.Fill" Value="{ThemeResource Local.AccentContrastFillColorBrush}" />
2143+
<Setter Target="Path4.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2144+
<Setter Target="Path5.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2145+
<Setter Target="Path6.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
20852146
</VisualState.Setters>
20862147
</VisualState>
20872148
</VisualStateGroup>
@@ -2104,16 +2165,28 @@
21042165
VerticalAlignment="Center">
21052166
<Path
21062167
Name="Path1"
2168+
Data="M9.75 5C8.50736 5 7.5 6.00736 7.5 7.25V15.75C7.5 16.0175 7.54691 16.2752 7.63337 16.5146L7.8966 17.2432L12.7799 12.4967C13.4227 11.8717 14.4262 11.8382 15.1073 12.3963L15.2268 12.5036L20.1026 17.2439L20.3662 16.5158C20.4529 16.2761 20.5 16.018 20.5 15.75V7.25C20.5 6.00736 19.4926 5 18.25 5H9.75Z"
2169+
Fill="{ThemeResource Local.AccentContrastFillColorBrush}"
2170+
Opacity=".80" />
2171+
2172+
<Path
2173+
Name="Path2"
2174+
Data="M14.8703 12.8552C14.4334 12.4304 13.7643 12.3884 13.2808 12.7282L13.2645 12.7397L13.1417 12.8414L8.24219 17.6063L9.00411 17.8736C9.23795 17.9556 9.48891 18 9.74917 18H18.2492C18.5094 18 18.7604 17.9556 18.9942 17.8736L19.7562 17.6062L14.8703 12.8552Z"
2175+
Fill="{ThemeResource Local.IconBaseBrush}"
2176+
Opacity=".30" />
2177+
2178+
<Path
2179+
Name="Path3"
21072180
Data="M17.7497 9.00045C17.7497 8.31048 17.1904 7.75116 16.5004 7.75116C15.8105 7.75116 15.2512 8.31048 15.2512 9.00045C15.2512 9.69041 15.8105 10.2497 16.5004 10.2497C17.1904 10.2497 17.7497 9.69041 17.7497 9.00045Z"
21082181
Fill="{ThemeResource Local.IconBaseBrush}" />
21092182

21102183
<Path
2111-
Name="Path2"
2184+
Name="Path4"
21122185
Data="M21.5 7.25C21.5 5.45507 20.0449 4 18.25 4H9.75C7.95507 4 6.5 5.45507 6.5 7.25V15.75C6.5 17.5449 7.95507 19 9.75 19H18.25C20.0449 19 21.5 17.5449 21.5 15.75V7.25ZM13.477 13.2137L13.5691 13.1373C13.859 12.9335 14.2606 12.959 14.5226 13.2137L18.8295 17.4018C18.6481 17.4654 18.4531 17.5 18.25 17.5H9.75C9.54688 17.5 9.35185 17.4654 9.17047 17.4018L13.477 13.2137ZM9.75 5.5H18.25C19.2165 5.5 20 6.2835 20 7.25V15.75C20 15.9592 19.9633 16.1597 19.896 16.3457L15.5682 12.1382L15.4335 12.0172C14.5572 11.2913 13.261 11.3316 12.4313 12.1382L8.10363 16.3447C8.03656 16.159 8 15.9588 8 15.75V7.25C8 6.2835 8.7835 5.5 9.75 5.5Z"
21132186
Fill="{ThemeResource Local.IconBaseBrush}" />
21142187

21152188
<Path
2116-
Name="Path3"
2189+
Name="Path5"
21172190
Data="M4 23.25C4 22.8358 4.33579 22.5 4.75 22.5H23.25C23.6642 22.5 24 22.8358 24 23.25C24 23.6642 23.6642 24 23.25 24H4.75C4.33579 24 4 23.6642 4 23.25Z"
21182191
Fill="{ThemeResource Local.IconBaseBrush}" />
21192192
</Canvas>
@@ -2124,7 +2197,12 @@
21242197
<VisualState x:Name="Disabled" />
21252198
<VisualState x:Name="Selected">
21262199
<VisualState.Setters>
2127-
<Setter Target="Path1.Fill" Value="{ThemeResource Local.AccentContrastFillColorBrush}" />
2200+
<Setter Target="Path1.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2201+
<Setter Target="Path2.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2202+
<Setter Target="Path2.Opacity" Value=".20" />
2203+
<Setter Target="Path3.Fill" Value="{ThemeResource Local.AccentContrastFillColorBrush}" />
2204+
<Setter Target="Path4.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2205+
<Setter Target="Path5.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
21282206
</VisualState.Setters>
21292207
</VisualState>
21302208
</VisualStateGroup>
@@ -2147,16 +2225,29 @@
21472225
VerticalAlignment="Center">
21482226
<Path
21492227
Name="Path1"
2228+
Data="M7.75 3C6.50736 3 5.5 4.00736 5.5 5.25V17.75C5.5 18.0166 5.54657 18.2733 5.63244 18.512L5.89619 19.2449L12.7753 12.5087C13.4209 11.8763 14.4344 11.844 15.1172 12.412L15.2311 12.5154L22.103 19.2456L22.3671 18.5133C22.4533 18.2743 22.5 18.017 22.5 17.75V5.25C22.5 4.00736 21.4926 3 20.25 3H7.75Z"
2229+
Fill="{ThemeResource Local.AccentContrastFillColorBrush}"
2230+
Opacity=".80" />
2231+
2232+
<Path
2233+
Name="Path2"
2234+
Data="M14.8737 12.8659C14.4316 12.4329 13.7492 12.394 13.2633 12.7482L13.2486 12.759L13.1373 12.8532L6.24414 19.6058L7.00161 19.8726C7.23618 19.9552 7.48803 20 7.74926 20H20.2493C20.5105 20 20.7623 19.9552 20.9969 19.8726L21.7544 19.6058L14.8737 12.8659Z"
2235+
Fill="{ThemeResource Local.IconBaseBrush}"
2236+
Opacity=".30" />
2237+
2238+
2239+
<Path
2240+
Name="Path3"
21502241
Data="M18.7497 8.00045C18.7497 7.31048 18.1904 6.75116 17.5004 6.75116C16.8105 6.75116 16.2512 7.31048 16.2512 8.00045C16.2512 8.69041 16.8105 9.24974 17.5004 9.24974C18.1904 9.24974 18.7497 8.69041 18.7497 8.00045Z"
21512242
Fill="{ThemeResource Local.IconBaseBrush}" />
21522243

21532244
<Path
2154-
Name="Path2"
2245+
Name="Path4"
21552246
Data="M23.5 5.25C23.5 3.45507 22.0449 2 20.25 2H7.75C5.95507 2 4.5 3.45507 4.5 5.25V17.75C4.5 19.5449 5.95507 21 7.75 21H20.25C22.0449 21 23.5 19.5449 23.5 17.75V5.25ZM14.5246 13.2231L20.8315 19.4011C20.6496 19.4651 20.4539 19.5 20.25 19.5H7.75C7.54613 19.5 7.3504 19.4651 7.16845 19.4011L13.475 13.2231L13.5586 13.1523C13.8499 12.9399 14.2595 12.9635 14.5246 13.2231ZM7.75 3.5H20.25C21.2165 3.5 22 4.2835 22 5.25V17.75C22 17.9584 21.9636 18.1583 21.8967 18.3437L15.5741 12.1515L15.4457 12.0349C14.5673 11.2967 13.2585 11.3355 12.4254 12.1515L6.1029 18.3427C6.0363 18.1576 6 17.958 6 17.75V5.25C6 4.2835 6.7835 3.5 7.75 3.5Z"
21562247
Fill="{ThemeResource Local.IconBaseBrush}" />
21572248

21582249
<Path
2159-
Name="Path3"
2250+
Name="Path5"
21602251
Data="M4.75 24.5C4.33579 24.5 4 24.8358 4 25.25C4 25.6642 4.33579 26 4.75 26H23.25C23.6642 26 24 25.6642 24 25.25C24 24.8358 23.6642 24.5 23.25 24.5H4.75Z"
21612252
Fill="{ThemeResource Local.IconBaseBrush}" />
21622253
</Canvas>
@@ -2167,7 +2258,12 @@
21672258
<VisualState x:Name="Disabled" />
21682259
<VisualState x:Name="Selected">
21692260
<VisualState.Setters>
2170-
<Setter Target="Path1.Fill" Value="{ThemeResource Local.AccentContrastFillColorBrush}" />
2261+
<Setter Target="Path1.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2262+
<Setter Target="Path2.Fill" Value="{ThemeResource Local.IconAccentFillColor}" />
2263+
<Setter Target="Path2.Opacity" Value=".20" />
2264+
<Setter Target="Path3.Fill" Value="{ThemeResource Local.AccentContrastFillColorBrush}" />
2265+
<Setter Target="Path4.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
2266+
<Setter Target="Path5.Fill" Value="{ThemeResource Local.IconAccentStrokeColor}" />
21712267
</VisualState.Setters>
21722268
</VisualState>
21732269
</VisualStateGroup>

0 commit comments

Comments
 (0)