Skip to content

Code Quality: Clean solution #16366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Code Quality: Clean solution #16366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e31bd31
Clean solution
Lamparter Oct 18, 2024
5701faa
Revert changes to `Files.App.Controls` global using directives
Lamparter Oct 18, 2024
c1a91a2
Revert changes to `Files.App.Storage` global using directives
Lamparter Oct 18, 2024
5d48b5b
Revert changes to `Files.App` global using directives
Lamparter Oct 18, 2024
95db974
Revert changes to `Files.Core.Storage` global using directives
Lamparter Oct 18, 2024
67690fd
Add using directive for `Microsoft.UI.Content` in shell preview model
Lamparter Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/Files.App.Controls/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,8 @@
// Licensed under the MIT License. See the LICENSE.

// System
global using global::System;
global using global::System.Collections;
global using global::System.Collections.Generic;
global using global::System.Collections.ObjectModel;
global using global::System.Linq;
global using global::System.Threading;
global using global::System.Threading.Tasks;
global using global::System.ComponentModel;
global using global::System.Diagnostics;
global using SystemIO = global::System.IO;

// Files.Shared
global using global::Files.Shared;
global using global::Files.Shared.Attributes;
global using global::Files.Shared.Extensions;
global using global::System.Collections.Generic;
114 changes: 57 additions & 57 deletions src/Files.App.Controls/ThemedIcon/ThemedIcon.Consts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,69 +6,69 @@

namespace Files.App.Controls
{
// Template Parts
[TemplatePart(Name = FilledPathIconViewBox, Type = typeof(Viewbox))]
[TemplatePart(Name = OutlinePathIconViewBox, Type = typeof(Viewbox))]
[TemplatePart(Name = LayeredPathIconViewBox, Type = typeof(Viewbox))]
[TemplatePart(Name = LayeredPathCanvas, Type = typeof(Canvas))]

// Icon Type Visual States
[TemplateVisualState(Name = OutlineTypeStateName, GroupName = IconTypeStateGroupName)]
[TemplateVisualState(Name = LayeredTypeStateName, GroupName = IconTypeStateGroupName)]
[TemplateVisualState(Name = FilledTypeStateName, GroupName = IconTypeStateGroupName)]
// Template Parts
[TemplatePart(Name = FilledPathIconViewBox, Type = typeof(Viewbox))]
[TemplatePart(Name = OutlinePathIconViewBox, Type = typeof(Viewbox))]
[TemplatePart(Name = LayeredPathIconViewBox, Type = typeof(Viewbox))]
[TemplatePart(Name = LayeredPathCanvas, Type = typeof(Canvas))]

// Icon Color Visual States
[TemplateVisualState(Name = NormalStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = CriticalStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = CautionStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = SuccessStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = NeutralStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = AccentStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = CustomColorStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = ToggleStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = DisabledColorStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = DisabledToggleColorStateName, GroupName = IconColorStateGroupName)]
// Icon Type Visual States
[TemplateVisualState(Name = OutlineTypeStateName, GroupName = IconTypeStateGroupName)]
[TemplateVisualState(Name = LayeredTypeStateName, GroupName = IconTypeStateGroupName)]
[TemplateVisualState(Name = FilledTypeStateName, GroupName = IconTypeStateGroupName)]

// Icon IsEnabled Visual States
[TemplateVisualState(Name = EnabledStateName, GroupName = EnabledStateGroupName)]
[TemplateVisualState(Name = DisabledStateName, GroupName = EnabledStateGroupName)]
// Icon Color Visual States
[TemplateVisualState(Name = NormalStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = CriticalStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = CautionStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = SuccessStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = NeutralStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = AccentStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = CustomColorStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = ToggleStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = DisabledColorStateName, GroupName = IconColorStateGroupName)]
[TemplateVisualState(Name = DisabledToggleColorStateName, GroupName = IconColorStateGroupName)]

public partial class ThemedIcon
{
// Visual State Group Names
internal const string IconTypeStateGroupName = "IconTypeStates";
internal const string IconColorStateGroupName = "IconColorStates";
internal const string EnabledStateGroupName = "EnabledStates";
// Icon IsEnabled Visual States
[TemplateVisualState(Name = EnabledStateName, GroupName = EnabledStateGroupName)]
[TemplateVisualState(Name = DisabledStateName, GroupName = EnabledStateGroupName)]

// "Icon Type" Visual State Names
internal const string OutlineTypeStateName = "Outline";
internal const string FilledTypeStateName = "Filled";
internal const string LayeredTypeStateName = "Layered";
public partial class ThemedIcon
{
// Visual State Group Names
internal const string IconTypeStateGroupName = "IconTypeStates";
internal const string IconColorStateGroupName = "IconColorStates";
internal const string EnabledStateGroupName = "EnabledStates";

// "Icon State" Visual State Names
internal const string NormalStateName = "Normal";
internal const string CriticalStateName = "Critical";
internal const string CautionStateName = "Caution";
internal const string SuccessStateName = "Success";
internal const string NeutralStateName = "Neutral";
internal const string AccentStateName = "Accent";
internal const string CustomColorStateName = "Custom";
internal const string ToggleStateName = "Toggle";
internal const string DisabledColorStateName = "DisabledColor";
internal const string DisabledToggleColorStateName = "DisabledToggleColor";
// "Icon Type" Visual State Names
internal const string OutlineTypeStateName = "Outline";
internal const string FilledTypeStateName = "Filled";
internal const string LayeredTypeStateName = "Layered";

// "Enabled" Visual State Names
internal const string EnabledStateName = "Enabled";
internal const string DisabledStateName = "Disabled";
// "Icon State" Visual State Names
internal const string NormalStateName = "Normal";
internal const string CriticalStateName = "Critical";
internal const string CautionStateName = "Caution";
internal const string SuccessStateName = "Success";
internal const string NeutralStateName = "Neutral";
internal const string AccentStateName = "Accent";
internal const string CustomColorStateName = "Custom";
internal const string ToggleStateName = "Toggle";
internal const string DisabledColorStateName = "DisabledColor";
internal const string DisabledToggleColorStateName = "DisabledToggleColor";

// ViewBox Controls
internal const string FilledPathIconViewBox = "PART_FilledIconViewBox";
internal const string OutlinePathIconViewBox = "PART_OutlineIconViewBox";
internal const string LayeredPathIconViewBox = "PART_LayeredIconViewBox";
internal const string LayeredPathCanvas = "PART_LayerCanvas";
// "Enabled" Visual State Names
internal const string EnabledStateName = "Enabled";
internal const string DisabledStateName = "Disabled";

// Path Controls
internal const string FilledIconPath = "PART_FilledPath";
internal const string OutlineIconPath = "PART_OutlinePath";
}
// ViewBox Controls
internal const string FilledPathIconViewBox = "PART_FilledIconViewBox";
internal const string OutlinePathIconViewBox = "PART_OutlineIconViewBox";
internal const string LayeredPathIconViewBox = "PART_LayeredIconViewBox";
internal const string LayeredPathCanvas = "PART_LayerCanvas";

// Path Controls
internal const string FilledIconPath = "PART_FilledPath";
internal const string OutlineIconPath = "PART_OutlinePath";
}
}
Loading