From 7ca7ffd61e72118c79e40e4e789ce49b74c4332c Mon Sep 17 00:00:00 2001
From: Martin Anderson <mdta@live.co.uk>
Date: Mon, 6 Jan 2025 02:48:39 +0000
Subject: [PATCH] Code Quality: Added Shelf Icon (#16674)

---
 .../ThemedIcon/Styles/Icons.Misc16.xaml       | 32 +++++++++++++++++++
 .../Views/ThemedIconPage.xaml                 |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Files.App.Controls/ThemedIcon/Styles/Icons.Misc16.xaml b/src/Files.App.Controls/ThemedIcon/Styles/Icons.Misc16.xaml
index 0f1ec1b1ce60..214d848f2374 100644
--- a/src/Files.App.Controls/ThemedIcon/Styles/Icons.Misc16.xaml
+++ b/src/Files.App.Controls/ThemedIcon/Styles/Icons.Misc16.xaml
@@ -271,4 +271,36 @@
 		</Setter>
 	</Style>
 
+
+	<Style
+		x:Key="App.ThemedIcons.Shelf"
+		BasedOn="{StaticResource DefaultThemedIconStyle}"
+		TargetType="local:ThemedIcon">
+
+
+		<Setter Property="IconSize" Value="16" />
+
+		<Setter Property="OutlineIconData" Value="m4.15,8.15c-.2.2-.2.51,0,.71l3,3c.2.2.51.2.71,0l3-3c.2-.2.2-.51,0-.71-.2-.2-.51-.2-.71,0l-2.15,2.15V.5C8,.22,7.78,0,7.5,0s-.5.22-.5.5v9.79l-2.15-2.15c-.2-.2-.51-.2-.71,0ZM9,1.15v1.02c2.87.68,5,3.25,5,6.33,0,3.59-2.91,6.5-6.5,6.5S1,12.09,1,8.5c0-3.07,2.13-5.65,5-6.33v-1.02C2.58,1.85,0,4.87,0,8.5c0,4.14,3.36,7.5,7.5,7.5s7.5-3.36,7.5-7.5c0-3.63-2.58-6.66-6-7.35Z" />
+		<Setter Property="FilledIconData" Value="m4.2,8.25c-.28.31-.26.78.05,1.06l2.75,2.5c.29.26.72.26,1.01,0l2.75-2.5c.31-.28.33-.75.05-1.06-.28-.31-.75-.33-1.06-.05l-1.5,1.36V.75C8.25.34,7.91,0,7.5,0s-.75.34-.75.75v8.8l-1.5-1.36c-.31-.28-.78-.26-1.06.05ZM9.25,1.21v1.55c2.46.75,4.25,3.04,4.25,5.74,0,3.31-2.69,6-6,6S1.5,11.81,1.5,8.5c0-2.7,1.79-4.99,4.25-5.74v-1.55C2.45,1.99,0,4.96,0,8.5c0,4.14,3.36,7.5,7.5,7.5s7.5-3.36,7.5-7.5c0-3.54-2.45-6.51-5.75-7.29Z" />
+
+		<Setter Property="Layers">
+			<Setter.Value>
+				<local:ThemedIconLayers>
+					<local:ThemedIconLayer
+						LayerSize="16"
+						LayerType="Alt"
+						PathData="m6,1.66v6.22l-.44-.44c-.59-.59-1.54-.59-2.12,0-.59.59-.59,1.54,0,2.12l3,3c.59.59,1.54.59,2.12,0l3-3c.59-.59.59-1.54,0-2.12-.59-.59-1.54-.59-2.12,0l-.44.44V1.66c3.15.69,5.5,3.49,5.5,6.84,0,3.87-3.13,7-7,7S.5,12.37.5,8.5C.5,5.15,2.85,2.35,6,1.66Z" />
+					<local:ThemedIconLayer
+						LayerSize="16"
+						LayerType="Base"
+						PathData="m6,1.15C2.58,1.85,0,4.87,0,8.5c0,4.14,3.36,7.5,7.5,7.5s7.5-3.36,7.5-7.5c0-3.63-2.58-6.66-6-7.35v1.02c2.87.68,5,3.25,5,6.33,0,3.59-2.91,6.5-6.5,6.5S1,12.09,1,8.5c0-3.07,2.13-5.65,5-6.33v-1.02Z" />
+					<local:ThemedIconLayer
+						LayerSize="16"
+						LayerType="Accent"
+						PathData="m7.5,0c.28,0,.5.22.5.5v9.79l2.15-2.15c.2-.2.51-.2.71,0,.2.2.2.51,0,.71l-3,3c-.2.2-.51.2-.71,0l-3-3c-.2-.2-.2-.51,0-.71.2-.2.51-.2.71,0l2.15,2.15V.5c0-.28.22-.5.5-.5Z" />
+				</local:ThemedIconLayers>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
 </ResourceDictionary>
diff --git a/tests/Files.App.UITests/Views/ThemedIconPage.xaml b/tests/Files.App.UITests/Views/ThemedIconPage.xaml
index 7cf9e7437967..e8fff645787a 100644
--- a/tests/Files.App.UITests/Views/ThemedIconPage.xaml
+++ b/tests/Files.App.UITests/Views/ThemedIconPage.xaml
@@ -13,7 +13,7 @@
 		<ResourceDictionary>
 			<Style
 				x:Key="IconTest"
-				BasedOn="{StaticResource App.ThemedIcons.AltDataStream}"
+				BasedOn="{StaticResource App.ThemedIcons.Shelf}"
 				TargetType="controls:ThemedIcon">
 				<Setter Property="IconSize" Value="16" />
 				<Setter Property="Width" Value="16" />