Fix code style issues (#3626)

MaterialDesignThemes.Wpf/Automation /Behaviours /Converters/CircularProgressBar

Author: JLdgu

src/MaterialDesignThemes.Wpf/Automation/Peers/TreeListViewItemAutomationPeer.cs

@@ -1,21 +1,16 @@
 using System.Windows.Automation.Peers;
-using System.Windows.Automation.Provider;
 
 namespace MaterialDesignThemes.Wpf.Automation.Peers;
 
-public class TreeListViewAutomationPeer : ListViewAutomationPeer
+public class TreeListViewAutomationPeer(TreeListView owner) : ListViewAutomationPeer(owner)
 {
-    public TreeListViewAutomationPeer(TreeListView owner) : base(owner)
-    {
-    }
-
     protected override AutomationControlType GetAutomationControlTypeCore() => AutomationControlType.Tree;
 
     protected override string GetClassNameCore() => "TreeListView";
 
     protected override List<AutomationPeer>? GetChildrenCore()
     {
-        ItemsControl owner = (ItemsControl)Owner;
+        var owner = (ItemsControl)Owner;
         ItemCollection items = owner.Items;
         List<AutomationPeer>? children = null;
 
@@ -24,7 +19,7 @@ public TreeListViewAutomationPeer(TreeListView owner) : base(owner)
             children = new List<AutomationPeer>(items.Count);
             for (int i = 0; i < items.Count; i++)
             {
-                TreeListViewItem? treeViewItem = owner.ItemContainerGenerator.ContainerFromIndex(i) as TreeListViewItem;
+                var treeViewItem = owner.ItemContainerGenerator.ContainerFromIndex(i) as TreeListViewItem;
                 //We grab top level items only
                 if (treeViewItem is { Level: 0 })
                 {
@@ -35,20 +30,11 @@ public TreeListViewAutomationPeer(TreeListView owner) : base(owner)
         return children;
     }
 
-    protected override ItemAutomationPeer CreateItemAutomationPeer(object item)
-    {
-        return new TreeListViewItemAutomationPeer(item, this);
-    }
+    protected override ItemAutomationPeer CreateItemAutomationPeer(object item) => new TreeListViewItemAutomationPeer(item, this);
 }
 
-public class TreeListViewItemAutomationPeer : ListBoxItemAutomationPeer
+public class TreeListViewItemAutomationPeer(object owner, SelectorAutomationPeer selectorAutomationPeer) : ListBoxItemAutomationPeer(owner, selectorAutomationPeer)
 {
-    public TreeListViewItemAutomationPeer(object owner, SelectorAutomationPeer selectorAutomationPeer)
-        : base(owner, selectorAutomationPeer)
-    {
-
-    }
-
     protected override List<AutomationPeer> GetChildrenCore()
     {
         List<AutomationPeer> rv = base.GetChildrenCore();

src/MaterialDesignThemes.Wpf/Behaviors/PasswordBoxBehavior.cs

@@ -14,7 +14,7 @@ private void PasswordBoxPreviewGotKeyboardFocus(object sender, KeyboardFocusChan
             if (ReferenceEquals(e.OldFocus, revealPasswordTextBox) && ReferenceEquals(e.NewFocus, AssociatedObject))
             {
                 // When password box receives keyboard focus, but it came from the nested reveal TextBox. We request focus transfer to the previous element from the password box's POV
-                TraversalRequest request = new TraversalRequest(FocusNavigationDirection.Previous);
+                TraversalRequest request = new(FocusNavigationDirection.Previous);
                 AssociatedObject.MoveFocus(request);
                 e.Handled = true;
             }

src/MaterialDesignThemes.Wpf/Converters/CircularProgressBar/ArcEndPointConverter.cs

@@ -15,41 +15,38 @@ public class ArcEndPointConverter : IMultiValueConverter
 
     public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        var actualWidth = values[0].ExtractDouble();
-        var value = values[1].ExtractDouble();
-        var minimum = values[2].ExtractDouble();
-        var maximum = values[3].ExtractDouble();
+        double actualWidth = values[0].ExtractDouble();
+        double value = values[1].ExtractDouble();
+        double minimum = values[2].ExtractDouble();
+        double maximum = values[3].ExtractDouble();
 
         if (new[] { actualWidth, value, minimum, maximum }.AnyNan())
             return Binding.DoNothing;
 
         if (values.Length == 5)
         {
-            var fullIndeterminateScaling = values[4].ExtractDouble();
+            double fullIndeterminateScaling = values[4].ExtractDouble();
             if (!double.IsNaN(fullIndeterminateScaling) && fullIndeterminateScaling > 0.0)
             {
                 value = (maximum - minimum) * fullIndeterminateScaling;
             }
         }
 
-        var percent = maximum <= minimum ? 1.0 : (value - minimum) / (maximum - minimum);
+        double percent = maximum <= minimum ? 1.0 : (value - minimum) / (maximum - minimum);
         if (Equals(parameter, ParameterMidPoint))
             percent /= 2;
 
-        var degrees = 360 * percent;
-        var radians = degrees * (Math.PI / 180);
+        double degrees = 360 * percent;
+        double radians = degrees * (Math.PI / 180);
 
         var centre = new Point(actualWidth / 2, actualWidth / 2);
-        var hypotenuseRadius = (actualWidth / 2);
+        double hypotenuseRadius = (actualWidth / 2);
 
-        var adjacent = Math.Cos(radians) * hypotenuseRadius;
-        var opposite = Math.Sin(radians) * hypotenuseRadius;
+        double adjacent = Math.Cos(radians) * hypotenuseRadius;
+        double opposite = Math.Sin(radians) * hypotenuseRadius;
 
         return new Point(centre.X + opposite, centre.Y - adjacent);
     }
 
-    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException();
 }

src/MaterialDesignThemes.Wpf/Converters/CircularProgressBar/ArcSizeConverter.cs

@@ -6,17 +6,7 @@ namespace MaterialDesignThemes.Wpf.Converters.CircularProgressBar;
 public class ArcSizeConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        if (value is double && ((double)value > 0.0))
-        {
-            return new Size((double)value / 2, (double)value / 2);
-        }
+        => value is double v && (v > 0.0) ? new Size(v / 2, v / 2) : new Point();
 
-        return new Point();
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => Binding.DoNothing;
 }

src/MaterialDesignThemes.Wpf/Converters/CircularProgressBar/LocalEx.cs

@@ -4,13 +4,10 @@ internal static class LocalEx
 {
     public static double ExtractDouble(this object value)
     {
-        var d = value as double? ?? double.NaN;
+        double d = value as double? ?? double.NaN;
         return double.IsInfinity(d) ? double.NaN : d;
     }
 
 
-    public static bool AnyNan(this IEnumerable<double> values)
-    {
-        return values.Any(double.IsNaN);
-    }
+    public static bool AnyNan(this IEnumerable<double> values) => values.Any(double.IsNaN);
 }

src/MaterialDesignThemes.Wpf/Converters/CircularProgressBar/RotateTransformCentreConverter.cs

@@ -5,14 +5,8 @@ namespace MaterialDesignThemes.Wpf.Converters.CircularProgressBar;
 
 public class RotateTransformCentreConverter : IValueConverter
 {
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        //value == actual width
-        return (double)value / 2;
-    }
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) =>        
+        (double)value / 2; //value == actual width
 
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => Binding.DoNothing;
 }

src/MaterialDesignThemes.Wpf/Converters/CircularProgressBar/StartPointConverter.cs

@@ -8,18 +8,15 @@ public class StartPointConverter : IValueConverter
     [Obsolete]
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        if (value is double && ((double)value > 0.0))
+        if (value is double v && (v > 0.0))
         {
-            return new Point((double)value / 2, 0);
+            return new Point(v / 2, 0);
         }
 
         return new Point();
     }
 
     [Obsolete]
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => Binding.DoNothing;
 
 }