Skip to content

Commit be602bf

Browse files
authored
Code Quality: Replace OpacityIcon (#15843)
1 parent 512921a commit be602bf

File tree

93 files changed

+478
-3801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+478
-3801
lines changed

src/Files.App.Controls/ThemedIcon/Styles/Icons.Properties.Dialog.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188

189189

190190
<Style
191-
x:Key="App.ThemedIcons.Properties.CustomiseFile"
191+
x:Key="App.ThemedIcons.Properties.CustomizeFile"
192192
BasedOn="{StaticResource DefaultThemedIconStyle}"
193193
TargetType="local:ThemedIcon">
194194

@@ -211,7 +211,7 @@
211211

212212

213213
<Style
214-
x:Key="App.ThemedIcons.Properties.CustomiseFolder"
214+
x:Key="App.ThemedIcons.Properties.CustomizeFolder"
215215
BasedOn="{StaticResource DefaultThemedIconStyle}"
216216
TargetType="local:ThemedIcon">
217217

src/Files.App.Controls/ThemedIcon/Styles/Icons.SizeLayout.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131

132132

133133
<Style
134-
x:Key="App.ThemedIcons.IconLayout_Tiles"
134+
x:Key="App.ThemedIcons.IconLayout.Tiles"
135135
BasedOn="{StaticResource DefaultThemedIconStyle}"
136136
TargetType="local:ThemedIcon">
137137

@@ -157,7 +157,7 @@
157157

158158

159159
<Style
160-
x:Key="App.ThemedIcons.IconLayout_List"
160+
x:Key="App.ThemedIcons.IconLayout.List"
161161
BasedOn="{StaticResource DefaultThemedIconStyle}"
162162
TargetType="local:ThemedIcon">
163163

@@ -183,7 +183,7 @@
183183

184184

185185
<Style
186-
x:Key="App.ThemedIcons.IconLayout_Columns"
186+
x:Key="App.ThemedIcons.IconLayout.Columns"
187187
BasedOn="{StaticResource DefaultThemedIconStyle}"
188188
TargetType="local:ThemedIcon">
189189

@@ -205,7 +205,7 @@
205205

206206

207207
<Style
208-
x:Key="App.ThemedIcons.IconLayout_Details"
208+
x:Key="App.ThemedIcons.IconLayout.Details"
209209
BasedOn="{StaticResource DefaultThemedIconStyle}"
210210
TargetType="local:ThemedIcon">
211211

@@ -226,7 +226,7 @@
226226

227227

228228
<Style
229-
x:Key="App.ThemedIcons.IconLayout_Auto"
229+
x:Key="App.ThemedIcons.IconLayout.Auto"
230230
BasedOn="{StaticResource DefaultThemedIconStyle}"
231231
TargetType="local:ThemedIcon">
232232

src/Files.App.Controls/ThemedIcon/ThemedIcon.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<local:ThemedIconLayer
2020
LayerType="Base"
2121
Opacity="1.0"
22-
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" />
22+
PathData="" />
2323
<local:ThemedIconLayer
2424
LayerType="Alt"
2525
Opacity="1.0"
26-
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" />
26+
PathData="" />
2727
</local:ThemedIconLayers>
2828
</Setter.Value>
2929
</Setter>

src/Files.App/Actions/Content/ImageManipulation/RotateLeftAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public override string Description
1414
=> "RotateLeftDescription".GetLocalizedResource();
1515

1616
public override RichGlyph Glyph
17-
=> new(opacityStyle: "ColorIconRotateLeft");
17+
=> new(themedIconStyle: "App.ThemedIcons.ImageRotate.ACW");
1818

1919
protected override BitmapRotation Rotation
2020
=> BitmapRotation.Clockwise270Degrees;

src/Files.App/Actions/Content/ImageManipulation/RotateRightAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public override string Description
1414
=> "RotateRightDescription".GetLocalizedResource();
1515

1616
public override RichGlyph Glyph
17-
=> new(opacityStyle: "ColorIconRotateRight");
17+
=> new(themedIconStyle: "App.ThemedIcons.ImageRotate.CW");
1818

1919
protected override BitmapRotation Rotation
2020
=> BitmapRotation.Clockwise90Degrees;

src/Files.App/Actions/Content/Selection/ClearSelectionAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public string Description
1414
=> "ClearSelectionDescription".GetLocalizedResource();
1515

1616
public RichGlyph Glyph
17-
=> new("\uE8E6");
17+
=> new(themedIconStyle: "App.ThemedIcons.SelectNone");
1818

1919
public bool IsExecutable
2020
{

src/Files.App/Actions/Content/Selection/InvertSelectionAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public string Description
1414
=> "InvertSelectionDescription".GetLocalizedResource();
1515

1616
public RichGlyph Glyph
17-
=> new("\uE746");
17+
=> new(themedIconStyle: "App.ThemedIcons.SelectInvert");
1818

1919
public bool IsExecutable
2020
{

src/Files.App/Actions/Content/Selection/SelectAllAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public string Description
1414
=> "SelectAllDescription".GetLocalizedResource();
1515

1616
public RichGlyph Glyph
17-
=> new("\uE8B3");
17+
=> new(themedIconStyle: "App.ThemedIcons.SelectAll");
1818

1919
public HotKey HotKey
2020
=> new(Keys.A, KeyModifiers.Ctrl);

src/Files.App/Actions/Content/Share/ShareItemAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public string Description
1616
=> "ShareItemDescription".GetLocalizedResource();
1717

1818
public RichGlyph Glyph
19-
=> new(opacityStyle: "ColorIconShare");
19+
=> new(themedIconStyle: "App.ThemedIcons.Share");
2020

2121
public bool IsExecutable =>
2222
IsContextPageTypeAdaptedToCommand() &&

src/Files.App/Actions/Display/LayoutAction.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public override string Description
1515
=> "LayoutDetailsDescription".GetLocalizedResource();
1616

1717
public override RichGlyph Glyph
18-
=> new(opacityStyle: "Icons.DetailsLayout.16x16");
18+
=> new(themedIconStyle: "App.ThemedIcons.IconLayout.Details");
1919

2020
public override HotKey HotKey
2121
=> new(Keys.Number1, KeyModifiers.CtrlShift);
@@ -33,7 +33,7 @@ public override string Description
3333
=> "LayoutListDescription".GetLocalizedResource();
3434

3535
public override RichGlyph Glyph
36-
=> new(opacityStyle: "Icons.ListLayout.16x16");
36+
=> new(themedIconStyle: "App.ThemedIcons.IconLayout.List");
3737

3838
public override HotKey HotKey
3939
=> new(Keys.Number2, KeyModifiers.CtrlShift);
@@ -51,7 +51,7 @@ public override string Description
5151
=> "LayoutTilesDescription".GetLocalizedResource();
5252

5353
public override RichGlyph Glyph
54-
=> new(opacityStyle: "Icons.TilesLayout.16x16");
54+
=> new(themedIconStyle: "App.ThemedIcons.IconLayout.Tiles");
5555

5656
public override HotKey HotKey
5757
=> new(Keys.Number3, KeyModifiers.CtrlShift);
@@ -69,7 +69,7 @@ public override string Description
6969
=> "LayoutGridDescription".GetLocalizedResource();
7070

7171
public override RichGlyph Glyph
72-
=> new(opacityStyle: "Icons.GridLayout.16x16");
72+
=> new(themedIconStyle: "App.ThemedIcons.IconSize.Small");
7373

7474
public override HotKey HotKey
7575
=> new(Keys.Number4, KeyModifiers.CtrlShift);
@@ -87,7 +87,7 @@ public override string Description
8787
=> "LayoutColumnsDescription".GetLocalizedResource();
8888

8989
public override RichGlyph Glyph
90-
=> new(opacityStyle: "Icons.ColumnsLayout.16x16");
90+
=> new(themedIconStyle: "App.ThemedIcons.IconLayout.Columns");
9191

9292
public override HotKey HotKey
9393
=> new(Keys.Number5, KeyModifiers.CtrlShift);
@@ -108,7 +108,7 @@ public override bool IsExecutable
108108
=> Context.IsLayoutAdaptiveEnabled;
109109

110110
public override RichGlyph Glyph
111-
=> new("\uF576");
111+
=> new(themedIconStyle: "App.ThemedIcons.IconLayout.Auto");
112112

113113
public override HotKey HotKey
114114
=> new(Keys.Number6, KeyModifiers.CtrlShift);

0 commit comments

Comments
 (0)