Use typed constant instead

Author: 0x5bfa

src/Files.App.Controls/ThemedIcon/ThemedIcon.Properties.cs

@@ -6,15 +6,15 @@
 
 namespace Files.App.Controls
 {
-	[DependencyProperty<string>("FilledIconData", nameof(OnFilledIconPropertyChanged), DefaultValue = "string.Empty")]
-	[DependencyProperty<string>("OutlineIconData", nameof(OnOutlineIconPropertyChanged), DefaultValue = "string.Empty")]
+	[DependencyProperty<string>("FilledIconData", nameof(OnFilledIconPropertyChanged), DefaultValue = "")]
+	[DependencyProperty<string>("OutlineIconData", nameof(OnOutlineIconPropertyChanged), DefaultValue = "")]
 	[DependencyProperty<Brush>("Color", nameof(OnColorPropertyChanged))]
-	[DependencyProperty<ThemedIconTypes>("IconType", nameof(OnIconTypePropertyChanged), DefaultValue = "ThemedIconTypes.Layered")]
-	[DependencyProperty<ThemedIconColorType>("IconColorType", nameof(OnIconColorTypePropertyChanged), DefaultValue = "ThemedIconColorType.None")]
-	[DependencyProperty<double>("IconSize", nameof(OnIconSizePropertyChanged), DefaultValue = "(double)16")]
-	[DependencyProperty<bool>("IsToggled", nameof(OnIsToggledPropertyChanged), DefaultValue = "false")]
-	[DependencyProperty<bool>("IsFilled", nameof(OnIsFilledPropertyChanged), DefaultValue = "false")]
-	[DependencyProperty<bool>("IsHighContrast", nameof(OnIsHighContrastPropertyChanged), DefaultValue = "false")]
+	[DependencyProperty<ThemedIconTypes>("IconType", nameof(OnIconTypePropertyChanged), DefaultValue = ThemedIconTypes.Layered)]
+	[DependencyProperty<ThemedIconColorType>("IconColorType", nameof(OnIconColorTypePropertyChanged), DefaultValue = ThemedIconColorType.None)]
+	[DependencyProperty<double>("IconSize", nameof(OnIconSizePropertyChanged), DefaultValue = 16)]
+	[DependencyProperty<bool>("IsToggled", nameof(OnIsToggledPropertyChanged), DefaultValue = false)]
+	[DependencyProperty<bool>("IsFilled", nameof(OnIsFilledPropertyChanged), DefaultValue = false)]
+	[DependencyProperty<bool>("IsHighContrast", nameof(OnIsHighContrastPropertyChanged), DefaultValue = false)]
 	[DependencyProperty<object>("Layers", nameof(OnLayersPropertyChanged))]
 	public partial class ThemedIcon : Control
 	{

src/Files.Core.SourceGenerator/Generators/DependencyPropertyGenerator.cs

@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Data.SqlTypes;
+using System.Linq;
 using System.Text;
 
 namespace Files.Core.SourceGenerator
@@ -65,6 +66,7 @@ private string EmitSyntaxTree(INamedTypeSymbol typeSymbol, ImmutableArray<Attrib
 				var fieldName = $"{propertyName}Property";
 				var isSetterPrivate = false;
 				var defaultValue = "global::Microsoft.UI.Xaml.DependencyProperty.UnsetValue";
+				TypedConstant typedDefaultValueConstant = default;
 				var isNullable = false;
 
 				// Get values from the attribute properties
@@ -75,14 +77,27 @@ private string EmitSyntaxTree(INamedTypeSymbol typeSymbol, ImmutableArray<Attrib
 						switch (namedArgument.Key)
 						{
 							case "IsSetterPrivate": isSetterPrivate = (bool)value; break;
-							case "DefaultValue": defaultValue = (string)value; break;
+							case "DefaultValue": defaultValue = value.ToString(); typedDefaultValueConstant = namedArgument.Value; break;
 							case "IsNullable": isNullable = (bool)value; break;
 						}
 					}
 				}
 
+				ExpressionSyntax defaultValueExpression;
+
+				if (string.IsNullOrEmpty(defaultValue))
+					defaultValueExpression = SyntaxFactory.ParseExpression("global::Microsoft.UI.Xaml.DependencyProperty.UnsetValue");
+				else if (defaultValue.Equals("True", StringComparison.OrdinalIgnoreCase))
+					defaultValueExpression = SyntaxFactory.ParseExpression("(bool)true");
+				else if (defaultValue.Equals("False", StringComparison.OrdinalIgnoreCase))
+					defaultValueExpression = SyntaxFactory.ParseExpression("(bool)false");
+				else if (typedDefaultValueConstant.Kind is TypedConstantKind.Enum or TypedConstantKind.Primitive && typedDefaultValueConstant.Type is { } defaultValueTypeSymbol)
+					defaultValueExpression = SyntaxFactory.ParseExpression($"({defaultValueTypeSymbol.Name}){defaultValue}");
+				else
+					defaultValueExpression = SyntaxFactory.ParseExpression("global::Microsoft.UI.Xaml.DependencyProperty.UnsetValue");
+
 				// Emit "new PropertyMetadata(...)"
-				var dpPropertyMetadata = EmitPMObjectCreationExpression(SyntaxFactory.ParseExpression(defaultValue));
+				var dpPropertyMetadata = EmitPMObjectCreationExpression(defaultValueExpression);
 
 				// Append callback method to PropertyMetadata
 				if (!string.IsNullOrEmpty(callbackMethodName))

src/Files.Shared/Attributes/DependencyPropertyAttribute.cs

@@ -22,5 +22,5 @@ public DependencyPropertyAttribute(string name, string propertyChanged = "")
 
 	public bool IsNullable { get; init; }
 
-	public string DefaultValue { get; init; } = "DependencyProperty.UnsetValue";
+	public object? DefaultValue { get; init; }
 }