Update

Author: 0x5bfa

src/Files.App/UserControls/DataGridHeader.xaml.cs

@@ -3,85 +3,35 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
 
 namespace Files.App.UserControls
 {
-	public sealed partial class DataGridHeader : UserControl, INotifyPropertyChanged
+	[DependencyProperty<string>("Header")]
+	[DependencyProperty<bool>("CanBeSorted")]
+	[DependencyProperty<SortDirection>("ColumnSortOption", "OnColumnSortOptionChanged", IsNullable = true)]
+	public sealed partial class DataGridHeader : UserControl
 	{
 		public ICommand Command { get; set; }
 		public object CommandParameter { get; set; }
 
-		private string header;
-
-		public string Header
+		public void OnColumnSortOptionChanged(SortDirection? oldValue, SortDirection? newValue)
 		{
-			get { return header; }
-			set
-			{
-				if (value != header)
+			VisualStateManager.GoToState(
+				this,
+				newValue switch
 				{
-					header = value;
-					NotifyPropertyChanged(nameof(Header));
-				}
-			}
-		}
-
-		private bool canBeSorted = true;
-
-		public bool CanBeSorted
-		{
-			get { return canBeSorted; }
-			set
-			{
-				if (value != canBeSorted)
-				{
-					canBeSorted = value;
-					NotifyPropertyChanged(nameof(CanBeSorted));
-				}
-			}
-		}
-
-		private SortDirection? columnSortOption;
-
-		public SortDirection? ColumnSortOption
-		{
-			get { return columnSortOption; }
-			set
-			{
-				if (value != columnSortOption)
-				{
-					switch (value)
-					{
-						case SortDirection.Ascending:
-							VisualStateManager.GoToState(this, "SortAscending", true);
-							break;
-
-						case SortDirection.Descending:
-							VisualStateManager.GoToState(this, "SortDescending", true);
-							break;
-
-						default:
-							VisualStateManager.GoToState(this, "Unsorted", true);
-							break;
-					}
-					columnSortOption = value;
-				}
-			}
+					SortDirection.Ascending => "SortAscending",
+					SortDirection.Descending => "SortDescending",
+					_ => "Unsorted",
+				},
+				true);
 		}
 
 		public DataGridHeader()
 		{
 			InitializeComponent();
 		}
-
-		public event PropertyChangedEventHandler PropertyChanged;
-
-		private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
-		{
-			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-		}
 	}
 }

src/Files.App/UserControls/FolderEmptyIndicator.xaml

@@ -39,7 +39,7 @@
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
 						<Setter Target="EmptyText.Visibility" Value="Visible" />
-						<Setter Target="EmptyText.Text" Value="{x:Bind GetTranslated('NoSearchResultsFound')}" />
+						<Setter Target="EmptyText.Text" Value="{helpers:ResourceString Name=NoSearchResultsFound}" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>

src/Files.App/UserControls/FolderEmptyIndicator.xaml.cs

@@ -1,28 +1,13 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Extensions;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
-
 namespace Files.App.UserControls
 {
+	[DependencyProperty<EmptyTextType>("EmptyTextType")]
 	public sealed partial class FolderEmptyIndicator : UserControl
 	{
-		public EmptyTextType EmptyTextType
-		{
-			get { return (EmptyTextType)GetValue(EmptyTextTypeProperty); }
-			set { SetValue(EmptyTextTypeProperty, value); }
-		}
-
-		// Using a DependencyProperty as the backing store for EmptyTextType.  This enables animation, styling, binding, etc...
-		public static readonly DependencyProperty EmptyTextTypeProperty =
-			DependencyProperty.Register("EmptyTextType", typeof(EmptyTextType), typeof(FolderEmptyIndicator), new PropertyMetadata(null));
-
-		private string GetTranslated(string resourceName) => resourceName.GetLocalizedResource();
-
 		public FolderEmptyIndicator()
 		{
 			InitializeComponent();
@@ -35,4 +20,4 @@ public enum EmptyTextType
 		FolderEmpty,
 		NoSearchResultsFound,
 	}
-}
+}

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

@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Data.SqlTypes;
 using System.Text;
 
 namespace Files.Core.SourceGenerator
@@ -85,7 +86,7 @@ private string EmitSyntaxTree(INamedTypeSymbol typeSymbol, ImmutableArray<Attrib
 
 				// Append callback method to PropertyMetadata
 				if (!string.IsNullOrEmpty(callbackMethodName))
-					dpPropertyMetadata = EmitDPCallbackParenthesizedLambdaExpression(dpPropertyMetadata, callbackMethodName, type, typeSymbol);
+					dpPropertyMetadata = EmitDPCallbackParenthesizedLambdaExpression(dpPropertyMetadata, callbackMethodName, type, isNullable, typeSymbol);
 
 				// Emit "DependencyProperty.Register(...)" invocation expression
 				var dpRegisteringExpression = EmitDPRegisterInvocationExpression(propertyName, type, typeSymbol, dpPropertyMetadata);
@@ -123,7 +124,7 @@ private string EmitSyntaxTree(INamedTypeSymbol typeSymbol, ImmutableArray<Attrib
 			return SyntaxFactory.SyntaxTree(compilationUnit, encoding: Encoding.UTF8).GetText().ToString();
 		}
 
-		private ObjectCreationExpressionSyntax EmitDPCallbackParenthesizedLambdaExpression(ObjectCreationExpressionSyntax expression, string callbackName, ITypeSymbol type, ITypeSymbol classSymbol)
+		private ObjectCreationExpressionSyntax EmitDPCallbackParenthesizedLambdaExpression(ObjectCreationExpressionSyntax expression, string callbackName, ITypeSymbol type, bool isNullable, ITypeSymbol classSymbol)
 		{
 			// (d, e) => ((class)d).callbackName((type)e.OldValue, (type)e.NewValue)
 			return expression.AddArgumentListArguments(
@@ -144,14 +145,14 @@ private ObjectCreationExpressionSyntax EmitDPCallbackParenthesizedLambdaExpressi
 								.AddArgumentListArguments(
 									SyntaxFactory.Argument(
 										SyntaxFactory.CastExpression(
-											type.GetTypeSyntax(false),
+											type.GetTypeSyntax(isNullable),
 											SyntaxFactory.MemberAccessExpression(
 												SyntaxKind.SimpleMemberAccessExpression,
 												SyntaxFactory.IdentifierName("e"),
 												SyntaxFactory.IdentifierName("OldValue")))),
 									SyntaxFactory.Argument(
 										SyntaxFactory.CastExpression(
-											type.GetTypeSyntax(false),
+											type.GetTypeSyntax(isNullable),
 											SyntaxFactory.MemberAccessExpression(
 												SyntaxKind.SimpleMemberAccessExpression,
 												SyntaxFactory.IdentifierName("e"),