Fix code style issues (#3637)

* B Converters

* C Converters

* D & E Converters

Author: JLdgu

src/MaterialDesignThemes.Wpf/Converters/BooleanConverter.cs

@@ -3,16 +3,10 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-public class BooleanConverter<T> : IValueConverter
+public class BooleanConverter<T>(T trueValue, T falseValue) : IValueConverter
 {
-    public BooleanConverter(T trueValue, T falseValue)
-    {
-        TrueValue = trueValue;
-        FalseValue = falseValue;
-    }
-
-    public T TrueValue { get; set; }
-    public T FalseValue { get; set; }
+    public T TrueValue { get; set; } = trueValue;
+    public T FalseValue { get; set; } = falseValue;
 
     public virtual object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
         => value is bool boolValue && boolValue ? TrueValue : FalseValue;

src/MaterialDesignThemes.Wpf/Converters/BorderClipConverter.cs

@@ -36,9 +36,7 @@ public object Convert(object?[]? values, Type targetType, object? parameter, Cul
     }
 
     public object?[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+        => throw new NotImplementedException();
 
     // https://wpfspark.wordpress.com/2011/06/08/clipborder-a-wpf-border-that-clips/
     private static Geometry GetRoundRectangle(Rect baseRect, Thickness borderThickness, CornerRadius cornerRadius)
@@ -65,25 +63,25 @@ private static Geometry GetRoundRectangle(Rect baseRect, Thickness borderThickne
         }
 
         // Taking the border thickness into account
-        var leftHalf = borderThickness.Left * 0.5;
+        double leftHalf = borderThickness.Left * 0.5;
         if (leftHalf < double.Epsilon)
         {
             leftHalf = 0.0;
         }
 
-        var topHalf = borderThickness.Top * 0.5;
+        double topHalf = borderThickness.Top * 0.5;
         if (topHalf < double.Epsilon)
         {
             topHalf = 0.0;
         }
 
-        var rightHalf = borderThickness.Right * 0.5;
+        double rightHalf = borderThickness.Right * 0.5;
         if (rightHalf < double.Epsilon)
         {
             rightHalf = 0.0;
         }
 
-        var bottomHalf = borderThickness.Bottom * 0.5;
+        double bottomHalf = borderThickness.Bottom * 0.5;
         if (bottomHalf < double.Epsilon)
         {
             bottomHalf = 0.0;
@@ -121,7 +119,7 @@ private static Geometry GetRoundRectangle(Rect baseRect, Thickness borderThickne
         // Adjust the width of the TopLeft and TopRight rectangles so that they are proportional to the width of the baseRect 
         if (topLeftRect.Right > topRightRect.Left)
         {
-            var newWidth = (topLeftRect.Width / (topLeftRect.Width + topRightRect.Width)) * baseRect.Width;
+            double newWidth = (topLeftRect.Width / (topLeftRect.Width + topRightRect.Width)) * baseRect.Width;
             topLeftRect = new Rect(topLeftRect.Location.X, topLeftRect.Location.Y, newWidth, topLeftRect.Height);
             topRightRect = new Rect(
                 baseRect.Left + newWidth,
@@ -133,7 +131,7 @@ private static Geometry GetRoundRectangle(Rect baseRect, Thickness borderThickne
         // Adjust the height of the TopRight and BottomRight rectangles so that they are proportional to the height of the baseRect
         if (topRightRect.Bottom > bottomRightRect.Top)
         {
-            var newHeight = (topRightRect.Height / (topRightRect.Height + bottomRightRect.Height)) * baseRect.Height;
+            double newHeight = (topRightRect.Height / (topRightRect.Height + bottomRightRect.Height)) * baseRect.Height;
             topRightRect = new Rect(topRightRect.Location.X, topRightRect.Location.Y, topRightRect.Width, newHeight);
             bottomRightRect = new Rect(
                 bottomRightRect.Location.X,
@@ -145,7 +143,7 @@ private static Geometry GetRoundRectangle(Rect baseRect, Thickness borderThickne
         // Adjust the width of the BottomLeft and BottomRight rectangles so that they are proportional to the width of the baseRect
         if (bottomRightRect.Left < bottomLeftRect.Right)
         {
-            var newWidth = (bottomLeftRect.Width / (bottomLeftRect.Width + bottomRightRect.Width)) * baseRect.Width;
+            double newWidth = (bottomLeftRect.Width / (bottomLeftRect.Width + bottomRightRect.Width)) * baseRect.Width;
             bottomLeftRect = new Rect(bottomLeftRect.Location.X, bottomLeftRect.Location.Y, newWidth, bottomLeftRect.Height);
             bottomRightRect = new Rect(
                 baseRect.Left + newWidth,
@@ -157,7 +155,7 @@ private static Geometry GetRoundRectangle(Rect baseRect, Thickness borderThickne
         // Adjust the height of the TopLeft and BottomLeft rectangles so that they are proportional to the height of the baseRect
         if (bottomLeftRect.Top < topLeftRect.Bottom)
         {
-            var newHeight = (topLeftRect.Height / (topLeftRect.Height + bottomLeftRect.Height)) * baseRect.Height;
+            double newHeight = (topLeftRect.Height / (topLeftRect.Height + bottomLeftRect.Height)) * baseRect.Height;
             topLeftRect = new Rect(topLeftRect.Location.X, topLeftRect.Location.Y, topLeftRect.Width, newHeight);
             bottomLeftRect = new Rect(
                 bottomLeftRect.Location.X,
@@ -166,7 +164,7 @@ private static Geometry GetRoundRectangle(Rect baseRect, Thickness borderThickne
                 Math.Max(0.0, baseRect.Height - newHeight));
         }
 
-        var roundedRectGeometry = new StreamGeometry();
+        StreamGeometry roundedRectGeometry = new();
 
         using (var context = roundedRectGeometry.Open())
         {

src/MaterialDesignThemes.Wpf/Converters/BrushOpacityConverter.cs

@@ -10,7 +10,7 @@ public class BrushOpacityConverter : IValueConverter
     {
         if (value is SolidColorBrush brush)
         {
-            var opacity = System.Convert.ToDouble(parameter, CultureInfo.InvariantCulture);
+            double opacity = System.Convert.ToDouble(parameter, CultureInfo.InvariantCulture);
             SolidColorBrush rv = new(brush.Color)
             {
                 Opacity = opacity

src/MaterialDesignThemes.Wpf/Converters/BrushToRadialGradientBrushConverter.cs

@@ -8,8 +8,7 @@ public class BrushToRadialGradientBrushConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        var solidColorBrush = value as SolidColorBrush;
-        if (solidColorBrush == null) return Binding.DoNothing;
+        if (value is not SolidColorBrush solidColorBrush) return Binding.DoNothing;
 
         return new RadialGradientBrush(solidColorBrush.Color, Colors.Transparent)
         {
@@ -22,7 +21,5 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+        => Binding.DoNothing;
 }

src/MaterialDesignThemes.Wpf/Converters/CalendarDateCoalesceConverter.cs

@@ -15,9 +15,9 @@ public class CalendarDateCoalesceConverter : IMultiValueConverter
 {
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values?.Length != 2) throw new ArgumentException("Must specify two values", "values");
-        if (values[0] is not DateTime) throw new ArgumentException($"First value should be a {nameof(DateTime)}", "values");
-        if (values[1] is not null && values[1] is not DateTime) throw new ArgumentException($"Second value should be null or a {nameof(DateTime)}", "values");
+        if (values?.Length != 2) throw new ArgumentException("Must specify two values", nameof(values));
+        if (values[0] is not DateTime) throw new ArgumentException($"First value should be a {nameof(DateTime)}", nameof(values));
+        if (values[1] is not null && values[1] is not DateTime) throw new ArgumentException($"Second value should be null or a {nameof(DateTime)}", nameof(values));
 
         var selectedDate = (DateTime?)values[1];
 

src/MaterialDesignThemes.Wpf/Converters/CalendarYearMonthConverter.cs

@@ -8,7 +8,7 @@ public sealed class CalendarYearMonthConverter : IMultiValueConverter
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
     {
         long ticks = long.MaxValue;
-        foreach (var value in values ?? Enumerable.Empty<object?>())
+        foreach (object? value in values ?? Enumerable.Empty<object?>())
         {
             if (value is DateTime dt)
                 ticks = dt.Ticks;

src/MaterialDesignThemes.Wpf/Converters/ClockItemIsCheckedConverter.cs

@@ -3,23 +3,16 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class ClockItemIsCheckedConverter : IValueConverter
+internal class ClockItemIsCheckedConverter(Func<DateTime> currentTimeGetter, ClockDisplayMode displayMode, bool is24Hours) : IValueConverter
 {
-    private readonly Func<DateTime> _currentTimeGetter;
-    private readonly ClockDisplayMode _displayMode;
-    private readonly bool _is24Hours;
-
-    public ClockItemIsCheckedConverter(Func<DateTime> currentTimeGetter, ClockDisplayMode displayMode, bool is24Hours)
-    {
-        _currentTimeGetter = currentTimeGetter ?? throw new ArgumentNullException(nameof(currentTimeGetter));
-        _displayMode = displayMode;
-        _is24Hours = is24Hours;
-    }
+    private readonly Func<DateTime> _currentTimeGetter = currentTimeGetter ?? throw new ArgumentNullException(nameof(currentTimeGetter));
+    private readonly ClockDisplayMode _displayMode = displayMode;
+    private readonly bool _is24Hours = is24Hours;
 
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
         var dateTime = (DateTime)value;
-        var i = (int)parameter;
+        int i = (int)parameter;
 
         int converted;
         if (_displayMode == ClockDisplayMode.Hours)

src/MaterialDesignThemes.Wpf/Converters/ClockLineConverter.cs

@@ -19,12 +19,8 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        return Binding.DoNothing;
-    }
+        => Binding.DoNothing;
 
     public override object ProvideValue(IServiceProvider serviceProvider)
-    {
-        return this;
-    }
+        => this;
 }

src/MaterialDesignThemes.Wpf/Converters/DrawerOffsetConverter.cs

@@ -7,26 +7,19 @@ public class DrawerOffsetConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        var d = value as double? ?? 0;
+        double d = value as double? ?? 0;
         if (double.IsInfinity(d) || double.IsNaN(d)) d = 0;
 
-        var dock = (parameter is Dock) ? (Dock)parameter : Dock.Left;
-        switch (dock)
+        Dock dock = (parameter is Dock) ? (Dock)parameter : Dock.Left;
+        return dock switch
         {
-            case Dock.Top:
-                return new Thickness(0, 0 - d, 0, 0);
-            case Dock.Bottom:
-                return new Thickness(0, 0, 0, 0 - d);
-            case Dock.Right:
-                return new Thickness(0, 0, 0 - d, 0);
-            case Dock.Left:
-            default:
-                return new Thickness(0 - d, 0, 0, 0);
-        }
+            Dock.Top => new Thickness(0, 0 - d, 0, 0),
+            Dock.Bottom => new Thickness(0, 0, 0, 0 - d),
+            Dock.Right => new Thickness(0, 0, 0 - d, 0),
+            _ => (object)new Thickness(0 - d, 0, 0, 0),
+        };
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+        => throw new NotImplementedException();
 }

src/MaterialDesignThemes.Wpf/Converters/EqualityToVisibilityConverter.cs

@@ -13,7 +13,5 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
+        => throw new NotImplementedException();
 }