Merge pull request #54 from MaterialDesignInXAML/master

Made all converter classes public (MaterialDesignInXAML#3767)
adrbarros · Jan 16, 2025 · 857a7e8 · 857a7e8
2 parents c87c20d + e0ab487
commit 857a7e8
Show file tree

Hide file tree

Showing 33 changed files with 63 additions and 273 deletions.
diff --git a/src/MaterialDesignThemes.Wpf/Converters/BooleanAllConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/BooleanAllConverter.cs
@@ -3,7 +3,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class BooleanAllConverter : IMultiValueConverter
+public class BooleanAllConverter : IMultiValueConverter
 {
     public static readonly BooleanAllConverter Instance = new();
 

diff --git a/src/MaterialDesignThemes.Wpf/Converters/BorderClipConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/BorderClipConverter.cs
@@ -4,7 +4,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class BorderClipConverter : IMultiValueConverter
+public class BorderClipConverter : IMultiValueConverter
 {
     public static readonly BorderClipConverter Instance = new();
     public object Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)

diff --git a/src/MaterialDesignThemes.Wpf/Converters/DoubleToThicknessConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/DoubleToThicknessConverter.cs
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FallbackBrushConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FallbackBrushConverter.cs
@@ -4,7 +4,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class FallbackBrushConverter : IMultiValueConverter
+public class FallbackBrushConverter : IMultiValueConverter
 {
     public static readonly FallbackBrushConverter Instance = new();
 

diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintOffsetCalculationConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintOffsetCalculationConverter.cs
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintTransformConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintTransformConverter.cs
diff --git a/src/MaterialDesignThemes.Wpf/Converters/GridLinesVisibilityBorderToThicknessConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/GridLinesVisibilityBorderToThicknessConverter.cs
@@ -3,7 +3,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class GridLinesVisibilityBorderToThicknessConverter : IValueConverter
+public class GridLinesVisibilityBorderToThicknessConverter : IValueConverter
 {
     public static readonly GridLinesVisibilityBorderToThicknessConverter Instance = new();
 

diff --git a/src/MaterialDesignThemes.Wpf/Converters/HorizontalThicknessConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/HorizontalThicknessConverter.cs
@@ -3,7 +3,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class HorizontalThicknessConverter : IValueConverter
+public class HorizontalThicknessConverter : IValueConverter
 {
     public static readonly HorizontalThicknessConverter Instance = new();
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)

diff --git a/...nverters/DialogBackgroundBlurConverter.cs → ...Internal/DialogBackgroundBlurConverter.cs b/...nverters/DialogBackgroundBlurConverter.cs → ...Internal/DialogBackgroundBlurConverter.cs
@@ -7,8 +7,9 @@
 using System.Windows.Data;
 using System.Windows.Media.Effects;
 
-namespace MaterialDesignThemes.Wpf.Converters;
-internal sealed class DialogBackgroundBlurConverter : IMultiValueConverter
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
+
+public sealed class DialogBackgroundBlurConverter : IMultiValueConverter
 {
     public static readonly DialogBackgroundBlurConverter Instance = new();
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)

diff --git a/...nverters/DoubleToCornerRadiusConverter.cs → ...Internal/DoubleToCornerRadiusConverter.cs b/...nverters/DoubleToCornerRadiusConverter.cs → ...Internal/DoubleToCornerRadiusConverter.cs
@@ -1,9 +1,9 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace MaterialDesignThemes.Wpf.Converters;
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
 
-internal class DoubleToCornerRadiusConverter : IValueConverter
+public class DoubleToCornerRadiusConverter : IValueConverter
 {
     public static readonly DoubleToCornerRadiusConverter Instance = new();
 

diff --git a/...onverters/ExpanderRotateAngleConverter.cs → .../Internal/ExpanderRotateAngleConverter.cs b/...onverters/ExpanderRotateAngleConverter.cs → .../Internal/ExpanderRotateAngleConverter.cs
@@ -1,9 +1,9 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace MaterialDesignThemes.Wpf.Converters;
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
 
-internal class ExpanderRotateAngleConverter : IValueConverter
+public class ExpanderRotateAngleConverter : IValueConverter
 {
     public static readonly ExpanderRotateAngleConverter Instance = new();
 

diff --git a/...s/FloatingHintTextBlockMarginConverter.cs → ...l/FloatingHintTextBlockMarginConverter.cs b/...s/FloatingHintTextBlockMarginConverter.cs → ...l/FloatingHintTextBlockMarginConverter.cs
@@ -2,9 +2,9 @@
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace MaterialDesignThemes.Wpf.Converters;
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
 
-internal class FloatingHintTextBlockMarginConverter : IMultiValueConverter
+public class FloatingHintTextBlockMarginConverter : IMultiValueConverter
 {
     public static readonly FloatingHintTextBlockMarginConverter Instance = new();
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)

diff --git a/....Wpf/Converters/SliderToolTipConverter.cs → ...erters/Internal/SliderToolTipConverter.cs b/....Wpf/Converters/SliderToolTipConverter.cs → ...erters/Internal/SliderToolTipConverter.cs
@@ -1,9 +1,9 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace MaterialDesignThemes.Wpf.Converters;
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
 
-internal class SliderToolTipConverter : IMultiValueConverter
+public class SliderToolTipConverter : IMultiValueConverter
 {
     public static readonly SliderToolTipConverter Instance = new();
     public object? Convert(object?[]? values, Type? targetType, object? parameter, CultureInfo? culture)

diff --git a/...ters/SliderValueLabelPositionConverter.cs → ...rnal/SliderValueLabelPositionConverter.cs b/...ters/SliderValueLabelPositionConverter.cs → ...rnal/SliderValueLabelPositionConverter.cs
@@ -1,10 +1,10 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace MaterialDesignThemes.Wpf.Converters;
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
 
 [ValueConversion(typeof(double), typeof(double), ParameterType = typeof(Orientation))]
-internal class SliderValueLabelPositionConverter : IValueConverter
+public class SliderValueLabelPositionConverter : IValueConverter
 {
     public static readonly SliderValueLabelPositionConverter Instance = new();
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
@@ -15,7 +15,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             const double margin = 4.0;
             return orientation switch
             {
-                Orientation.Horizontal => (-width * 0.5) + halfGripWidth,
+                Orientation.Horizontal => -width * 0.5 + halfGripWidth,
                 Orientation.Vertical => -width - margin,
                 _ => throw new ArgumentOutOfRangeException(nameof(parameter))
             };

diff --git a/...extFieldClearButtonVisibilityConverter.cs → ...extFieldClearButtonVisibilityConverter.cs b/...extFieldClearButtonVisibilityConverter.cs → ...extFieldClearButtonVisibilityConverter.cs
@@ -1,9 +1,9 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace MaterialDesignThemes.Wpf.Converters;
+namespace MaterialDesignThemes.Wpf.Converters.Internal;
 
-internal class TextFieldClearButtonVisibilityConverter : IMultiValueConverter
+public class TextFieldClearButtonVisibilityConverter : IMultiValueConverter
 {
     public Visibility ContentEmptyVisibility { get; set; } = Visibility.Hidden;
 

diff --git a/src/MaterialDesignThemes.Wpf/Converters/IsDarkConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/IsDarkConverter.cs
@@ -5,7 +5,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class IsDarkConverter : IValueConverter
+public class IsDarkConverter : IValueConverter
 {
     public static readonly IsDarkConverter Instance = new();
 

diff --git a/src/MaterialDesignThemes.Wpf/Converters/RemoveAlphaBrushConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/RemoveAlphaBrushConverter.cs
@@ -4,7 +4,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class RemoveAlphaBrushConverter : IValueConverter, IMultiValueConverter
+public class RemoveAlphaBrushConverter : IValueConverter, IMultiValueConverter
 {
     public static readonly RemoveAlphaBrushConverter Instance = new();
 

diff --git a/src/MaterialDesignThemes.Wpf/Converters/StringLengthValueConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/StringLengthValueConverter.cs
@@ -3,7 +3,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
-internal class StringLengthValueConverter : IValueConverter
+public class StringLengthValueConverter : IValueConverter
 {
     public static readonly StringLengthValueConverter Instance = new();
 

diff --git a/src/MaterialDesignThemes.Wpf/Converters/TopThicknessConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/TopThicknessConverter.cs
@@ -3,6 +3,7 @@
 
 namespace MaterialDesignThemes.Wpf.Converters;
 
+[Obsolete]
 internal class TopThicknessConverter : IValueConverter
 {
     public static readonly TopThicknessConverter Instance = new();

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Slider.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Slider.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+                    xmlns:convertersInternal="clr-namespace:MaterialDesignThemes.Wpf.Converters.Internal"
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf">
 
   <ResourceDictionary.MergedDictionaries>
@@ -269,7 +270,7 @@
           <Grid.RenderTransform>
             <TransformGroup>
               <ScaleTransform ScaleX="0" ScaleY="0" />
-              <TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={x:Static converters:SliderValueLabelPositionConverter.Instance}, ConverterParameter={x:Static Orientation.Horizontal}}" Y="-40" />
+              <TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={x:Static convertersInternal:SliderValueLabelPositionConverter.Instance}, ConverterParameter={x:Static Orientation.Horizontal}}" Y="-40" />
             </TransformGroup>
           </Grid.RenderTransform>
           <AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
@@ -289,7 +290,7 @@
                      Foreground="{DynamicResource MaterialDesign.Brush.Background}"
                      TextAlignment="Center">
             <TextBlock.Text>
-              <MultiBinding Converter="{x:Static converters:SliderToolTipConverter.Instance}"
+              <MultiBinding Converter="{x:Static convertersInternal:SliderToolTipConverter.Instance}"
                             NotifyOnValidationError="True"
                             TargetNullValue=""
                             ValidatesOnDataErrors="True">
@@ -481,7 +482,7 @@
           <Grid.RenderTransform>
             <TransformGroup>
               <ScaleTransform ScaleX="0" ScaleY="0" />
-              <TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={x:Static converters:SliderValueLabelPositionConverter.Instance}, ConverterParameter={x:Static Orientation.Vertical}}" Y="-7" />
+              <TranslateTransform X="{Binding ActualWidth, ElementName=label, Converter={x:Static convertersInternal:SliderValueLabelPositionConverter.Instance}, ConverterParameter={x:Static Orientation.Vertical}}" Y="-7" />
             </TransformGroup>
           </Grid.RenderTransform>
           <AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
@@ -501,7 +502,7 @@
                      Foreground="{DynamicResource MaterialDesign.Brush.Background}"
                      TextAlignment="Center">
             <TextBlock.Text>
-              <MultiBinding Converter="{x:Static converters:SliderToolTipConverter.Instance}"
+              <MultiBinding Converter="{x:Static convertersInternal:SliderToolTipConverter.Instance}"
                             NotifyOnValidationError="True"
                             TargetNullValue=""
                             ValidatesOnDataErrors="True">

diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.AutoSuggestBox.xaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters"
+                    xmlns:convertersInternal="clr-namespace:MaterialDesignThemes.Wpf.Converters.Internal"
                     xmlns:internal="clr-namespace:MaterialDesignThemes.Wpf.Internal"
                     xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf"
                     xmlns:behaviors="clr-namespace:MaterialDesignThemes.Wpf.Behaviors">
@@ -13,7 +14,7 @@
          TargetType="{x:Type wpf:AutoSuggestBox}"
          BasedOn="{StaticResource MaterialDesignTextBoxBase}">
     <Style.Resources>
-      <converters:TextFieldClearButtonVisibilityConverter x:Key="ClearButtonVisibilityConverter" ContentEmptyVisibility="Collapsed" />
+      <convertersInternal:TextFieldClearButtonVisibilityConverter x:Key="ClearButtonVisibilityConverter" ContentEmptyVisibility="Collapsed" />
       <converters:TextFieldPrefixTextVisibilityConverter x:Key="PrefixSuffixTextVisibilityConverter" HiddenState="Collapsed" />
       <converters:BooleanToDashStyleConverter x:Key="BooleanToDashStyleConverter" TrueValue="{x:Static DashStyles.Solid}" />
       <converters:ThicknessCloneConverter x:Key="HelperTextMarginConverter" CloneEdges="Left,Right" />