Use generated DPs 2

Author: 0x5bfa

src/Files.App.Controls/Storage/RingShape/RingShape.Properties.cs

@@ -10,7 +10,7 @@ namespace Files.App.Controls.Primitives
 {
 	[DependencyProperty<double>("StartAngle", nameof(OnStartAngleChanged), DefaultValue = "(double)0.0")]
 	[DependencyProperty<double>("EndAngle", nameof(OnEndAngleChanged), DefaultValue = "(double)90.0")]
-	[DependencyProperty<SweepDirection>("SweepDirection", nameof(OnSweepDirectionChanged), DefaultValue = "SweepDirection.Clockwise")]
+	[DependencyProperty<SweepDirection>("SweepDirection", nameof(OnSweepDirectionChanged), DefaultValue = "(SweepDirection)1")]
 	[DependencyProperty<double>("MinAngle", nameof(OnMinAngleChanged), DefaultValue = "(double)0.0")]
 	[DependencyProperty<double>("MaxAngle", nameof(OnMaxAngleChanged), DefaultValue = "(double)360.0")]
 	[DependencyProperty<double>("RadiusWidth", nameof(OnRadiusWidthChanged), DefaultValue = "(double)0.0")]
@@ -31,7 +31,7 @@ protected virtual void OnEndAngleChanged(double oldValue, double newValue)
 			EndAngleChanged();
 		}
 
-		protected virtual void OnSweepDirectionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		protected virtual void OnSweepDirectionChanged(SweepDirection oldValue, SweepDirection newValue)
 		{
 			SweepDirectionChanged();
 		}

src/Files.App.Controls/Storage/RingShape/RingShape.cs

@@ -67,7 +67,7 @@ private void EndAngleChanged()
 		private void IsCircleChanged()
 		{
 			BeginUpdate();
-			_isCircle = isCircle;
+			_isCircle = IsCircle;
 			EndUpdate();
 		}
 
@@ -81,7 +81,7 @@ private void RadiusWidthChanged()
 		private void RadiusHeightChanged()
 		{
 			BeginUpdate();
-			AdjustRadiusHeight(this, radiusHeight, StrokeThickness);
+			AdjustRadiusHeight(this, RadiusHeight, StrokeThickness);
 			EndUpdate();
 		}
 
@@ -107,7 +107,7 @@ private void MinMaxAngleChanged(bool isMax)
 		private void SweepDirectionChanged()
 		{
 			BeginUpdate();
-			_sweepDirection = newSweepDirection;
+			_sweepDirection = SweepDirection;
 			EndUpdate();
 		}
 

src/Files.App.Controls/Storage/StorageBar/StorageBar.Constants.cs

@@ -9,14 +9,11 @@ namespace Files.App.Controls
 {
 	// TemplateParts
 	[TemplatePart(Name = ContainerPartName, Type = typeof(Grid))]
-
 	[TemplatePart(Name = ValueColumnPartName, Type = typeof(ColumnDefinition))]
 	[TemplatePart(Name = GapColumnPartName, Type = typeof(ColumnDefinition))]
 	[TemplatePart(Name = TrackColumnPartName, Type = typeof(ColumnDefinition))]
-
 	[TemplatePart(Name = ValueBorderPartName, Type = typeof(Border))]
 	[TemplatePart(Name = TrackBorderPartName, Type = typeof(Border))]
-
 	// VisualStates
 	[TemplateVisualState(Name = SafeStateName, GroupName = ControlStateGroupName)]
 	[TemplateVisualState(Name = CautionStateName, GroupName = ControlStateGroupName)]

src/Files.App.Controls/Storage/StorageBar/StorageBar.Properties.cs

@@ -5,182 +5,47 @@
 
 namespace Files.App.Controls
 {
+	[DependencyProperty<double>("ValueBarHeight", nameof(OnValueBarHeightChanged), DefaultValue = "(double)4.0")]
+	[DependencyProperty<double>("TrackBarHeight", nameof(OnTrackBarHeightChanged), DefaultValue = "(double)2.0")]
+	[DependencyProperty<BarShapes>("BarShape", nameof(OnBarShapeChanged), DefaultValue = "BarShapes.Round")]
+	[DependencyProperty<double>("Percent", nameof(OnPercentChanged), DefaultValue = "(double)0.0")]
+	[DependencyProperty<double>("PercentCaution", nameof(OnPercentCautionChanged), DefaultValue = "(double)75.1")]
+	[DependencyProperty<double>("PercentCritical", nameof(OnPercentCriticalChanged), DefaultValue = "(double)89.9")]
 	public partial class StorageBar
 	{
-		#region Value Bar Height (double)
-
-		/// <summary>
-		/// Identifies the ValueBarHeight dependency property.
-		/// </summary>
-		public static readonly DependencyProperty ValueBarHeightProperty =
-			DependencyProperty.Register(
-				nameof(ValueBarHeight),
-				typeof(double),
-				typeof(StorageBar),
-				new PropertyMetadata(4.0, (d, e) => ((StorageBar)d).OnValueBarHeightChanged((double)e.OldValue, (double)e.NewValue)));
-
-		/// <summary>
-		/// Gets or sets the height of the Value Bar.
-		/// </summary>
-		public double ValueBarHeight
-		{
-			get => (double)GetValue(ValueBarHeightProperty);
-			set => SetValue(ValueBarHeightProperty, value);
-		}
-
 		private void OnValueBarHeightChanged(double oldValue, double newValue)
 		{
 			UpdateControl(this);
 		}
 
-		#endregion
-
-		#region Track Bar Height (double)
-
-		/// <summary>
-		/// Identifies the TrackBarHeight dependency property.
-		/// </summary>
-		public static readonly DependencyProperty TrackBarHeightProperty =
-			DependencyProperty.Register(
-				nameof(TrackBarHeight),
-				typeof(double),
-				typeof(StorageBar),
-				new PropertyMetadata(2.0, (d, e) => ((StorageBar)d).OnTrackBarHeightChanged((double)e.OldValue, (double)e.NewValue)));
-
-		/// <summary>
-		/// Gets or sets the height of the Track Bar.
-		/// </summary>
-		public double TrackBarHeight
-		{
-			get => (double)GetValue(TrackBarHeightProperty);
-			set => SetValue(TrackBarHeightProperty, value);
-		}
-
 		private void OnTrackBarHeightChanged(double oldValue, double newValue)
 		{
 			UpdateControl(this);
 		}
 
-		#endregion
-
-		#region BarShape (BarShapes)
-
-		/// <summary>
-		/// Identifies the BarShape dependency property.
-		/// </summary>
-		public static readonly DependencyProperty BarShapeProperty =
-			DependencyProperty.Register(
-				nameof(BarShape),
-				typeof(BarShapes),
-				typeof(StorageBar),
-				new PropertyMetadata(BarShapes.Round, (d, e) => ((StorageBar)d).OnBarShapeChanged((BarShapes)e.OldValue, (BarShapes)e.NewValue)));
-
-		/// <summary>
-		/// Gets or sets an Enum value to choose from our two BarShapes. (Round, Flat)
-		/// </summary>
-		public BarShapes BarShape
-		{
-			get => (BarShapes)GetValue(BarShapeProperty);
-			set => SetValue(BarShapeProperty, value);
-		}
-
 		private void OnBarShapeChanged(BarShapes oldValue, BarShapes newValue)
 		{
 			UpdateControl(this);
 		}
 
-		#endregion
-
-		#region Percent (double)
-
-		/// <summary>
-		/// Identifies the Percent dependency property.
-		/// </summary>
-		public static readonly DependencyProperty PercentProperty =
-			DependencyProperty.Register(
-				nameof(Percent),
-				typeof(double),
-				typeof(StorageBar),
-				new PropertyMetadata(0.0, (d, e) => ((StorageBar)d).OnPercentChanged((double)e.OldValue, (double)e.NewValue)));
-
-		/// <summary>
-		/// Gets or sets the current value as a Percentage between 0.0 and 100.0.
-		/// </summary>
-		public double Percent
-		{
-			get => (double)GetValue(PercentProperty);
-			set => SetValue(PercentProperty, value);
-		}
-
 		private void OnPercentChanged(double oldValue, double newValue)
 		{
 			return; //Read-only
 
 			DoubleToPercentage(Value, Minimum, Maximum);
-
 			UpdateControl(this);
 		}
 
-		#endregion
-
-		#region PercentWarning (double)
-
-		/// <summary>
-		/// Identifies the PercentCaution dependency property.
-		/// </summary>
-		public static readonly DependencyProperty PercentCautionProperty =
-			DependencyProperty.Register(
-				nameof(PercentCaution),
-				typeof(double),
-				typeof(StorageBar),
-				new PropertyMetadata(75.1, (d, e) => ((StorageBar)d).OnPercentCautionChanged((double)e.OldValue, (double)e.NewValue)));
-
-		/// <summary>
-		/// Gets or sets the PercentCaution double value.
-		/// </summary>
-		public double PercentCaution
-		{
-			get => (double)GetValue(PercentCautionProperty);
-			set => SetValue(PercentCautionProperty, value);
-		}
-
 		private void OnPercentCautionChanged(double oldValue, double newValue)
 		{
 			UpdateControl(this);
 		}
 
-		#endregion
-
-		#region PercentCritical (double)
-
-		/// <summary>
-		/// Identifies the PercentCritical dependency property.
-		/// </summary>
-		public static readonly DependencyProperty PercentCriticalProperty =
-			DependencyProperty.Register(
-				nameof(PercentCritical),
-				typeof(double),
-				typeof(StorageBar),
-				new PropertyMetadata(89.9, (d, e) => ((StorageBar)d).OnPercentCriticalChanged((double)e.OldValue, (double)e.NewValue)));
-
-		/// <summary>
-		/// Gets or sets the PercentCritical double value.
-		/// </summary>
-		public double PercentCritical
-		{
-			get => (double)GetValue(PercentCriticalProperty);
-			set => SetValue(PercentCriticalProperty, value);
-		}
-
 		private void OnPercentCriticalChanged(double oldValue, double newValue)
 		{
 			UpdateControl(this);
 		}
 
-		#endregion
-
-		#region Derived RangeBase Events
-
 		/// <inheritdoc/>
 		protected override void OnValueChanged(double oldValue, double newValue)
 		{
@@ -202,7 +67,5 @@ protected override void OnMinimumChanged(double oldValue, double newValue)
 			base.OnMinimumChanged(oldValue, newValue);
 			UpdateValue(this, oldValue, newValue, false, -1.0);
 		}
-
-		#endregion
 	}
 }

src/Files.App.Controls/Storage/StorageRing/StorageRing.Constants.cs

@@ -12,15 +12,11 @@ namespace Files.App.Controls
 	[TemplatePart(Name = ContainerPartName,		 Type = typeof(Grid))]
 	[TemplatePart(Name = ValueRingShapePartName, Type = typeof(RingShape))]
 	[TemplatePart(Name = TrackRingShapePartName, Type = typeof(RingShape))]
-
-
 	// VisualStates
 	[TemplateVisualState(Name = SafeStateName,	   GroupName = ControlStateGroupName)]
 	[TemplateVisualState(Name = CautionStateName,  GroupName = ControlStateGroupName)]
 	[TemplateVisualState(Name = CriticalStateName, GroupName = ControlStateGroupName)]
 	[TemplateVisualState(Name = DisabledStateName, GroupName = ControlStateGroupName)]
-
-
 	public partial class StorageRing
 	{
 		internal const string ContainerPartName		 = "PART_Container";