Implement [BindableProperty] for AvatarView

Author: TheCodeTraveler

src/CommunityToolkit.Maui/Views/AvatarView.shared.cs

@@ -9,15 +9,6 @@ namespace CommunityToolkit.Maui.Views;
 /// <summary>AvatarView control.</summary>
 public partial class AvatarView : Border, IAvatarView, IBorderElement, IFontElement, ITextElement, IImageElement, ITextAlignmentElement, ILineHeightElement, ICornerElement
 {
-	/// <summary>The backing store for the <see cref="BorderColor" /> bindable property.</summary>
-	public static readonly BindableProperty BorderColorProperty = BindableProperty.Create(nameof(BorderColor), typeof(Color), typeof(IAvatarView), defaultValue: AvatarViewDefaults.DefaultBorderColor, propertyChanged: OnBorderColorPropertyChanged);
-
-	/// <summary>The backing store for the <see cref="BorderWidth" /> bindable property.</summary>
-	public static readonly BindableProperty BorderWidthProperty = BindableProperty.Create(nameof(BorderWidth), typeof(double), typeof(IAvatarView), defaultValue: AvatarViewDefaults.DefaultBorderWidth, propertyChanged: OnBorderWidthPropertyChanged);
-
-	/// <summary>The backing store for the <see cref="CornerRadius" /> bindable property.</summary>
-	public static readonly BindableProperty CornerRadiusProperty = BindableProperty.Create(nameof(CornerRadius), typeof(CornerRadius), typeof(ICornerElement), defaultValue: AvatarViewDefaults.DefaultCornerRadius, propertyChanged: OnCornerRadiusPropertyChanged);
-
 	/// <summary>The backing store for the <see cref="IFontElement.FontAttributes" /> bindable property.</summary>
 	public static readonly BindableProperty FontAttributesProperty = FontElement.FontAttributesProperty;
 
@@ -30,15 +21,9 @@ public partial class AvatarView : Border, IAvatarView, IBorderElement, IFontElem
 	/// <summary>The backing store for the <see cref="IFontElement.FontSize" /> bindable property.</summary>
 	public static readonly BindableProperty FontSizeProperty = FontElement.FontSizeProperty;
 
-	/// <summary>The backing store for the <see cref="ImageSource" /> bindable property.</summary>
-	public static readonly BindableProperty ImageSourceProperty = BindableProperty.Create(nameof(ImageSource), typeof(ImageSource), typeof(IImageElement), default(ImageSource), propertyChanged: OnImageSourcePropertyChanged);
-
 	/// <summary>The backing store for the <see cref="ITextStyle.TextColor" /> bindable property.</summary>
 	public static readonly BindableProperty TextColorProperty = TextElement.TextColorProperty;
 
-	/// <summary>The backing store for the <see cref="Text" /> bindable property.</summary>
-	public static readonly BindableProperty TextProperty = BindableProperty.Create(nameof(Text), typeof(string), typeof(AvatarView), defaultValue: AvatarViewDefaults.DefaultText, propertyChanged: OnTextPropertyChanged);
-
 	/// <summary>The backing store for the <see cref="TextTransform" /> bindable property.</summary>
 	public static readonly BindableProperty TextTransformProperty = TextElement.TextTransformProperty;
 
@@ -80,34 +65,13 @@ public AvatarView()
 	/// <summary>Gets or sets the control font.</summary>
 	public Microsoft.Maui.Font Font { get; set; } = Microsoft.Maui.Font.SystemFontOfSize((double)FontElement.FontSizeProperty.DefaultValue);
 
-	/// <summary>Gets or sets a value of the control border colour.</summary>
-	public Color BorderColor
-	{
-		get => (Color)GetValue(BorderColorProperty);
-		set => SetValue(BorderColorProperty, value);
-	}
-
-	/// <summary>Gets or sets a value of the control border width.</summary>
-	public double BorderWidth
-	{
-		get => (double)GetValue(BorderWidthProperty);
-		set => SetValue(BorderWidthProperty, value);
-	}
-
 	/// <summary>Gets or sets a value of the control text character spacing property.</summary>
 	public double CharacterSpacing
 	{
 		get => (double)GetValue(TextElement.CharacterSpacingProperty);
 		set => SetValue(TextElement.CharacterSpacingProperty, value);
 	}
 
-	/// <summary>Gets or sets a value of the control corner radius property.</summary>
-	public CornerRadius CornerRadius
-	{
-		get => (CornerRadius)GetValue(CornerRadiusProperty);
-		set => SetValue(CornerRadiusProperty, value);
-	}
-
 	/// <summary>Gets or sets a value of the control font attributes property.</summary>
 	public FontAttributes FontAttributes
 	{
@@ -137,20 +101,26 @@ public double FontSize
 		set => SetValue(FontElement.FontSizeProperty, value);
 	}
 
+	/// <summary>Gets or sets a value of the control border colour.</summary>
+	[BindableProperty(PropertyChangedMethodName = nameof(OnBorderColorPropertyChanged))]
+	public partial Color BorderColor { get; set; } = AvatarViewDefaults.DefaultBorderColor;
+
+	/// <summary>Gets or sets a value of the control border width.</summary>
+	[BindableProperty(PropertyChangedMethodName = nameof(OnBorderWidthPropertyChanged))]
+	public partial double BorderWidth { get; set; } = AvatarViewDefaults.DefaultBorderWidth;
+
+	/// <summary>Gets or sets a value of the control corner radius property.</summary>
+	[BindableProperty(PropertyChangedMethodName = nameof(OnCornerRadiusPropertyChanged))]
+	public partial CornerRadius CornerRadius { get; set; } = AvatarViewDefaults.DefaultCornerRadius;
+
 	/// <summary>Gets or sets a value of the control image source property.</summary>
 	[TypeConverter(typeof(ImageSourceConverter))]
-	public ImageSource ImageSource
-	{
-		get => (ImageSource)GetValue(ImageSourceProperty);
-		set => SetValue(ImageSourceProperty, value);
-	}
+	[BindableProperty(PropertyChangedMethodName = nameof(OnImageSourcePropertyChanged))]
+	public partial ImageSource ImageSource { get; set; }
 
 	/// <summary>Gets or sets a value of the control text property.</summary>
-	public string Text
-	{
-		get => (string)GetValue(TextProperty);
-		set => SetValue(TextProperty, value);
-	}
+	[BindableProperty(PropertyChangedMethodName = nameof(OnTextPropertyChanged))]
+	public partial string Text { get; set; } = AvatarViewDefaults.DefaultText;
 
 	/// <summary>Gets or sets a value of the control text colour property.</summary>
 	public Color TextColor
@@ -170,13 +140,13 @@ public TextTransform TextTransform
 
 	Aspect IImageElement.Aspect => avatarImage.Aspect;
 
-	Color IBorderElement.BorderColorDefaultValue => (Color)BorderColorProperty.DefaultValue;
+	Color IBorderElement.BorderColorDefaultValue => AvatarViewDefaults.DefaultBorderColor;
 
-	double IBorderElement.BorderWidthDefaultValue => (double)BorderWidthProperty.DefaultValue;
+	double IBorderElement.BorderWidthDefaultValue => AvatarViewDefaults.DefaultBorderWidth;
 
 	int IBorderElement.CornerRadius => (int)GetAverageCorderRadius(CornerRadius);
 
-	int IBorderElement.CornerRadiusDefaultValue => (int)GetAverageCorderRadius((CornerRadius)CornerRadiusProperty.DefaultValue);
+	int IBorderElement.CornerRadiusDefaultValue => (int)GetAverageCorderRadius(AvatarViewDefaults.DefaultCornerRadius);
 
 	TextAlignment ITextAlignment.HorizontalTextAlignment => ((ITextAlignmentElement)this).HorizontalTextAlignment;
 
@@ -344,15 +314,15 @@ void HandlePropertyChanged(object? sender, PropertyChangedEventArgs e)
 	{
 		// Ensure avatarImage is clipped to the bounds of the AvatarView whenever its Height, Width, CornerRadius and Padding properties change
 		if ((e.PropertyName == HeightProperty.PropertyName
-				|| e.PropertyName == WidthProperty.PropertyName
-				|| e.PropertyName == PaddingProperty.PropertyName
-				|| e.PropertyName == ImageSourceProperty.PropertyName
-				|| e.PropertyName == BorderWidthProperty.PropertyName
-				|| e.PropertyName == CornerRadiusProperty.PropertyName
-				|| e.PropertyName == StrokeThicknessProperty.PropertyName)
-			&& Height >= 0 // The default value of Height (before the view is drawn onto the page) is -1
-			&& Width >= 0 // The default value of Y (before the view is drawn onto the page) is -1
-			&& avatarImage.Source is not null)
+		     || e.PropertyName == WidthProperty.PropertyName
+		     || e.PropertyName == PaddingProperty.PropertyName
+		     || e.PropertyName == ImageSourceProperty.PropertyName
+		     || e.PropertyName == BorderWidthProperty.PropertyName
+		     || e.PropertyName == CornerRadiusProperty.PropertyName
+		     || e.PropertyName == StrokeThicknessProperty.PropertyName)
+		    && Height >= 0 // The default value of Height (before the view is drawn onto the page) is -1
+		    && Width >= 0 // The default value of Y (before the view is drawn onto the page) is -1
+		    && avatarImage.Source is not null)
 
 		{
 			Geometry? avatarImageClipGeometry = null;