files-community · yaira2 · Jul 24, 2024 · Jul 22, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/src/Files.App.Controls/ThemedIcon/Styles/Icons.Properties.Dialog.xaml b/src/Files.App.Controls/ThemedIcon/Styles/Icons.Properties.Dialog.xaml
@@ -188,7 +188,7 @@
 
 
 	<Style
-		x:Key="App.ThemedIcons.Properties.CustomiseFile"
+		x:Key="App.ThemedIcons.Properties.CustomizeFile"
 		BasedOn="{StaticResource DefaultThemedIconStyle}"
 		TargetType="local:ThemedIcon">
 
@@ -211,7 +211,7 @@
 
 
 	<Style
-		x:Key="App.ThemedIcons.Properties.CustomiseFolder"
+		x:Key="App.ThemedIcons.Properties.CustomizeFolder"
 		BasedOn="{StaticResource DefaultThemedIconStyle}"
 		TargetType="local:ThemedIcon">
 

diff --git a/src/Files.App.Controls/ThemedIcon/Styles/Icons.SizeLayout.xaml b/src/Files.App.Controls/ThemedIcon/Styles/Icons.SizeLayout.xaml
@@ -131,7 +131,7 @@
 
 
 	<Style
-		x:Key="App.ThemedIcons.IconLayout_Tiles"
+		x:Key="App.ThemedIcons.IconLayout.Tiles"
 		BasedOn="{StaticResource DefaultThemedIconStyle}"
 		TargetType="local:ThemedIcon">
 
@@ -157,7 +157,7 @@
 
 
 	<Style
-		x:Key="App.ThemedIcons.IconLayout_List"
+		x:Key="App.ThemedIcons.IconLayout.List"
 		BasedOn="{StaticResource DefaultThemedIconStyle}"
 		TargetType="local:ThemedIcon">
 
@@ -183,7 +183,7 @@
 
 
 	<Style
-		x:Key="App.ThemedIcons.IconLayout_Columns"
+		x:Key="App.ThemedIcons.IconLayout.Columns"
 		BasedOn="{StaticResource DefaultThemedIconStyle}"
 		TargetType="local:ThemedIcon">
 
@@ -205,7 +205,7 @@
 
 
 	<Style
-		x:Key="App.ThemedIcons.IconLayout_Details"
+		x:Key="App.ThemedIcons.IconLayout.Details"
 		BasedOn="{StaticResource DefaultThemedIconStyle}"
 		TargetType="local:ThemedIcon">
 
@@ -226,7 +226,7 @@
 
 
 	<Style
-		x:Key="App.ThemedIcons.IconLayout_Auto"
+		x:Key="App.ThemedIcons.IconLayout.Auto"
 		BasedOn="{StaticResource DefaultThemedIconStyle}"
 		TargetType="local:ThemedIcon">
 

diff --git a/src/Files.App.Controls/ThemedIcon/ThemedIcon.xaml b/src/Files.App.Controls/ThemedIcon/ThemedIcon.xaml
@@ -19,11 +19,11 @@
 					<local:ThemedIconLayer
 						LayerType="Base"
 						Opacity="1.0"
-						PathData="M8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2ZM1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8Z" />
+						PathData="" />
 					<local:ThemedIconLayer
 						LayerType="Alt"
 						Opacity="1.0"
-						PathData="M8 1.5C4.41015 1.5 1.5 4.41015 1.5 8C1.5 11.5899 4.41015 14.5 8 14.5C11.5899 14.5 14.5 11.5899 14.5 8C14.5 4.41015 11.5899 1.5 8 1.5Z" />
+						PathData="" />
 				</local:ThemedIconLayers>
 			</Setter.Value>
 		</Setter>

diff --git a/src/Files.App/Actions/Content/ImageManipulation/RotateLeftAction.cs b/src/Files.App/Actions/Content/ImageManipulation/RotateLeftAction.cs
@@ -14,7 +14,7 @@ public override string Description
 			=> "RotateLeftDescription".GetLocalizedResource();
 
 		public override RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconRotateLeft");
+			=> new(themedIconStyle: "App.ThemedIcons.ImageRotate.ACW");
 
 		protected override BitmapRotation Rotation
 			=> BitmapRotation.Clockwise270Degrees;

diff --git a/src/Files.App/Actions/Content/ImageManipulation/RotateRightAction.cs b/src/Files.App/Actions/Content/ImageManipulation/RotateRightAction.cs
@@ -14,7 +14,7 @@ public override string Description
 			=> "RotateRightDescription".GetLocalizedResource();
 
 		public override RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconRotateRight");
+			=> new(themedIconStyle: "App.ThemedIcons.ImageRotate.CW");
 
 		protected override BitmapRotation Rotation
 			=> BitmapRotation.Clockwise90Degrees;

diff --git a/src/Files.App/Actions/Content/Selection/ClearSelectionAction.cs b/src/Files.App/Actions/Content/Selection/ClearSelectionAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "ClearSelectionDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new("\uE8E6");
+			=> new(themedIconStyle: "App.ThemedIcons.SelectNone");
 
 		public bool IsExecutable
 		{

diff --git a/src/Files.App/Actions/Content/Selection/InvertSelectionAction.cs b/src/Files.App/Actions/Content/Selection/InvertSelectionAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "InvertSelectionDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new("\uE746");
+			=> new(themedIconStyle: "App.ThemedIcons.SelectInvert");
 
 		public bool IsExecutable
 		{

diff --git a/src/Files.App/Actions/Content/Selection/SelectAllAction.cs b/src/Files.App/Actions/Content/Selection/SelectAllAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "SelectAllDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new("\uE8B3");
+			=> new(themedIconStyle: "App.ThemedIcons.SelectAll");
 
 		public HotKey HotKey
 			=> new(Keys.A, KeyModifiers.Ctrl);

diff --git a/src/Files.App/Actions/Content/Share/ShareItemAction.cs b/src/Files.App/Actions/Content/Share/ShareItemAction.cs
@@ -16,7 +16,7 @@ public string Description
 			=> "ShareItemDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconShare");
+			=> new(themedIconStyle: "App.ThemedIcons.Share");
 
 		public bool IsExecutable =>
 			IsContextPageTypeAdaptedToCommand() &&

diff --git a/src/Files.App/Actions/Display/LayoutAction.cs b/src/Files.App/Actions/Display/LayoutAction.cs
@@ -15,7 +15,7 @@ public override string Description
 			=> "LayoutDetailsDescription".GetLocalizedResource();
 
 		public override RichGlyph Glyph
-			=> new(opacityStyle: "Icons.DetailsLayout.16x16");
+			=> new(themedIconStyle: "App.ThemedIcons.IconLayout.Details");
 
 		public override HotKey HotKey
 			=> new(Keys.Number1, KeyModifiers.CtrlShift);
@@ -33,7 +33,7 @@ public override string Description
 			=> "LayoutListDescription".GetLocalizedResource();
 
 		public override RichGlyph Glyph
-			=> new(opacityStyle: "Icons.ListLayout.16x16");
+			=> new(themedIconStyle: "App.ThemedIcons.IconLayout.List");
 
 		public override HotKey HotKey
 			=> new(Keys.Number2, KeyModifiers.CtrlShift);
@@ -51,7 +51,7 @@ public override string Description
 			=> "LayoutTilesDescription".GetLocalizedResource();
 
 		public override RichGlyph Glyph
-			=> new(opacityStyle: "Icons.TilesLayout.16x16");
+			=> new(themedIconStyle: "App.ThemedIcons.IconLayout.Tiles");
 
 		public override HotKey HotKey
 			=> new(Keys.Number3, KeyModifiers.CtrlShift);
@@ -69,7 +69,7 @@ public override string Description
 			=> "LayoutGridDescription".GetLocalizedResource();
 
 		public override RichGlyph Glyph
-			=> new(opacityStyle: "Icons.GridLayout.16x16");
+			=> new(themedIconStyle: "App.ThemedIcons.IconSize.Small");
 
 		public override HotKey HotKey
 			=> new(Keys.Number4, KeyModifiers.CtrlShift);
@@ -87,7 +87,7 @@ public override string Description
 			=> "LayoutColumnsDescription".GetLocalizedResource();
 
 		public override RichGlyph Glyph
-			=> new(opacityStyle: "Icons.ColumnsLayout.16x16");
+			=> new(themedIconStyle: "App.ThemedIcons.IconLayout.Columns");
 
 		public override HotKey HotKey
 			=> new(Keys.Number5, KeyModifiers.CtrlShift);
@@ -108,7 +108,7 @@ public override bool IsExecutable
 			=> Context.IsLayoutAdaptiveEnabled;
 
 		public override RichGlyph Glyph
-			=> new("\uF576");
+			=> new(themedIconStyle: "App.ThemedIcons.IconLayout.Auto");
 
 		public override HotKey HotKey
 			=> new(Keys.Number6, KeyModifiers.CtrlShift);

diff --git a/src/Files.App/Actions/FileSystem/AddItemAction.cs b/src/Files.App/Actions/FileSystem/AddItemAction.cs
@@ -18,7 +18,7 @@ public string Description
 			=> "AddItemDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconNew");
+			=> new(themedIconStyle: "App.ThemedIcons.New.Item");
 
 		public HotKey HotKey
 			=> new(Keys.I, KeyModifiers.CtrlShift);

diff --git a/src/Files.App/Actions/FileSystem/CopyPathAction.cs b/src/Files.App/Actions/FileSystem/CopyPathAction.cs
@@ -16,7 +16,7 @@ public string Description
 			=> "CopyPathDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new RichGlyph(opacityStyle: "ColorIconCopyPath");
+			=> new RichGlyph(themedIconStyle: "App.ThemedIcons.CopyAsPath");
 
 		public HotKey HotKey
 			=> new(Keys.C, KeyModifiers.CtrlShift);

diff --git a/src/Files.App/Actions/FileSystem/CopyPathWithQuotesAction.cs b/src/Files.App/Actions/FileSystem/CopyPathWithQuotesAction.cs
@@ -16,7 +16,7 @@ public string Description
 			=> "CopyPathWithQuotesDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new RichGlyph(opacityStyle: "ColorIconCopyPath");
+			=> new RichGlyph(themedIconStyle: "App.ThemedIcons.CopyAsPath");
 
 		public HotKey HotKey
 			=> new(Keys.C, KeyModifiers.CtrlAlt);

diff --git a/src/Files.App/Actions/FileSystem/CreateFolderWithSelectionAction.cs b/src/Files.App/Actions/FileSystem/CreateFolderWithSelectionAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "CreateFolderWithSelectionDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconNewFolder");
+			=> new(themedIconStyle: "App.ThemedIcons.New.Folder");
 
 		public bool IsExecutable =>
 			context.ShellPage is not null &&

diff --git a/src/Files.App/Actions/FileSystem/CreateShortcutAction.cs b/src/Files.App/Actions/FileSystem/CreateShortcutAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "CreateShortcutDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconShortcut");
+			=> new(themedIconStyle: "App.ThemedIcons.URL");
 
 		public override bool IsExecutable =>
 			context.HasSelection &&

diff --git a/src/Files.App/Actions/FileSystem/DeleteItemAction.cs b/src/Files.App/Actions/FileSystem/DeleteItemAction.cs
@@ -12,7 +12,7 @@ public string Description
 			=> "DeleteItemDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new RichGlyph(opacityStyle: "ColorIconDelete");
+			=> new RichGlyph(themedIconStyle: "App.ThemedIcons.Delete");
 
 		public HotKey HotKey
 			=> new(Keys.Delete);

diff --git a/src/Files.App/Actions/FileSystem/EmptyRecycleBinAction.cs b/src/Files.App/Actions/FileSystem/EmptyRecycleBinAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "EmptyRecycleBinDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconDelete");
+			=> new(themedIconStyle: "App.ThemedIcons.Delete");
 
 		public override bool IsExecutable =>
 			UIHelpers.CanShowDialog &&

diff --git a/src/Files.App/Actions/FileSystem/OpenItemAction.cs b/src/Files.App/Actions/FileSystem/OpenItemAction.cs
@@ -17,7 +17,7 @@ public string Description
 			=> "OpenItemDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconOpenFile");
+			=> new(themedIconStyle: "App.ThemedIcons.OpenFile");
 
 		public HotKey HotKey
 			=> new(Keys.Enter);
@@ -63,7 +63,7 @@ public string Description
 			=> "OpenItemWithApplicationPickerDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconOpenWith");
+			=> new(themedIconStyle: "App.ThemedIcons.OpenWith");
 
 		public bool IsExecutable =>
 			context.HasSelection &&

diff --git a/src/Files.App/Actions/FileSystem/PasteItemAction.cs b/src/Files.App/Actions/FileSystem/PasteItemAction.cs
@@ -22,7 +22,7 @@ public string Description
 			=> "PasteItemDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconPaste");
+			=> new(themedIconStyle: "App.ThemedIcons.Paste");
 
 		public HotKey HotKey
 			=> new(Keys.V, KeyModifiers.Ctrl);

diff --git a/src/Files.App/Actions/FileSystem/PasteItemToSelectionAction.cs b/src/Files.App/Actions/FileSystem/PasteItemToSelectionAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "PasteItemToSelectionDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconPaste");
+			=> new(themedIconStyle: "App.ThemedIcons.Paste");
 
 		public HotKey HotKey
 			=> new(Keys.V, KeyModifiers.CtrlShift);

diff --git a/src/Files.App/Actions/FileSystem/RenameAction.cs b/src/Files.App/Actions/FileSystem/RenameAction.cs
@@ -17,7 +17,7 @@ public HotKey HotKey
 			=> new(Keys.F2);
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconRename");
+			=> new(themedIconStyle: "App.ThemedIcons.Rename");
 
 		public bool IsExecutable =>
 			context.ShellPage is not null &&

diff --git a/src/Files.App/Actions/FileSystem/RestoreAllRecycleBinAction.cs b/src/Files.App/Actions/FileSystem/RestoreAllRecycleBinAction.cs
@@ -12,7 +12,7 @@ public string Description
 			=> "RestoreAllRecycleBinDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconRestoreItem");
+			=> new(themedIconStyle: "App.ThemedIcons.RestoreDeleted");
 
 		public override bool IsExecutable =>
 			UIHelpers.CanShowDialog &&

diff --git a/src/Files.App/Actions/FileSystem/RestoreRecycleBinAction.cs b/src/Files.App/Actions/FileSystem/RestoreRecycleBinAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "RestoreRecycleBinDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconRestoreItem");
+			=> new(themedIconStyle: "App.ThemedIcons.RestoreDeleted");
 
 		public override bool IsExecutable =>
 			context.PageType is ContentPageTypes.RecycleBin &&

diff --git a/src/Files.App/Actions/FileSystem/Transfer/CopyItemAction.cs b/src/Files.App/Actions/FileSystem/Transfer/CopyItemAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "CopyItemDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconCopy");
+			=> new(themedIconStyle: "App.ThemedIcons.Copy");
 
 		public HotKey HotKey
 			=> new(Keys.C, KeyModifiers.Ctrl);

diff --git a/src/Files.App/Actions/FileSystem/Transfer/CutItemAction.cs b/src/Files.App/Actions/FileSystem/Transfer/CutItemAction.cs
@@ -14,7 +14,7 @@ public string Description
 			=> "CutItemDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconCut");
+			=> new(themedIconStyle: "App.ThemedIcons.Cut");
 
 		public HotKey HotKey
 			=> new(Keys.X, KeyModifiers.Ctrl);

diff --git a/src/Files.App/Actions/Global/EnterCompactOverlayAction.cs b/src/Files.App/Actions/Global/EnterCompactOverlayAction.cs
@@ -14,7 +14,7 @@ public string Label
 			=> "EnterCompactOverlay".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconEnterCompactOverlay");
+			=> new(themedIconStyle: "App.ThemedIcons.CompactOverlay");
 
 		public HotKey HotKey
 			=> new(Keys.Up, KeyModifiers.CtrlAlt);

diff --git a/src/Files.App/Actions/Global/ExitCompactOverlayAction.cs b/src/Files.App/Actions/Global/ExitCompactOverlayAction.cs
@@ -13,7 +13,7 @@ public string Label
 			=> "ExitCompactOverlay".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconExitCompactOverlay");
+			=> new(themedIconStyle: "App.ThemedIcons.CompactOverlayExit");
 
 		public HotKey HotKey
 			=> new(Keys.Down, KeyModifiers.CtrlAlt);

diff --git a/src/Files.App/Actions/Navigation/AddHorizontalPaneAction.cs b/src/Files.App/Actions/Navigation/AddHorizontalPaneAction.cs
@@ -18,7 +18,7 @@ public HotKey HotKey
 			=> new(Keys.H, KeyModifiers.AltShift);
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconAddHorizontalPane");
+			=> new(themedIconStyle: "App.ThemedIcons.Panes.Horizontal");
 
 		public bool IsExecutable =>
 			ContentPageContext.IsMultiPaneAvailable &&

diff --git a/src/Files.App/Actions/Navigation/AddVerticalPaneAction.cs b/src/Files.App/Actions/Navigation/AddVerticalPaneAction.cs
@@ -18,7 +18,7 @@ public HotKey HotKey
 			=> new(Keys.V, KeyModifiers.AltShift);
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconAddVerticalPane");
+			=> new(themedIconStyle: "App.ThemedIcons.Panes.Vertical");
 
 		public bool IsExecutable =>
 			ContentPageContext.IsMultiPaneAvailable &&

diff --git a/src/Files.App/Actions/Navigation/ArrangePanesHorizontallyAction.cs b/src/Files.App/Actions/Navigation/ArrangePanesHorizontallyAction.cs
@@ -15,7 +15,7 @@ public string Description
 			=> "ArrangePanesHorizontallyDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconAddHorizontalPane");
+			=> new(themedIconStyle: "App.ThemedIcons.Panes.Horizontal");
 
 		public bool IsOn
 			=> MultiPanesContext.ShellPaneArrangement is ShellPaneArrangement.Horizontal;

diff --git a/src/Files.App/Actions/Navigation/ArrangePanesVerticallyAction.cs b/src/Files.App/Actions/Navigation/ArrangePanesVerticallyAction.cs
@@ -15,7 +15,7 @@ public string Description
 			=> "ArrangePanesVerticallyDescription".GetLocalizedResource();
 
 		public RichGlyph Glyph
-			=> new(opacityStyle: "ColorIconAddVerticalPane");
+			=> new(themedIconStyle: "App.ThemedIcons.Panes.Vertical");
 
 		public bool IsOn
 			=> MultiPanesContext.ShellPaneArrangement is ShellPaneArrangement.Vertical;

diff --git a/src/Files.App/Actions/Navigation/CloseActivePaneAction.cs b/src/Files.App/Actions/Navigation/CloseActivePaneAction.cs
@@ -17,7 +17,7 @@ public HotKey HotKey
 			=> new(Keys.W, KeyModifiers.CtrlShift);
 
 		public RichGlyph Glyph
-			=> new("\uE89F");
+			=> new(themedIconStyle: "App.ThemedIcons.PanelLeftClose");
 
 		public bool IsExecutable
 			=> ContentPageContext.IsMultiPaneActive;