Add a workaround way to override not selected text in DatePicker (thi…

…s is temporary solution)
AvaloniaCommunity · Nov 2, 2023 · 374d77b · 374d77b
1 parent d41f04b
commit 374d77b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/Material.Styles/Converters/DatePickerTextConverter.cs b/Material.Styles/Converters/DatePickerTextConverter.cs
@@ -5,24 +5,19 @@
 using Avalonia.Data;
 using Avalonia.Data.Converters;
 
-namespace Material.Styles.Converters
-{
-    public class DatePickerTextConverter : IMultiValueConverter
-    {
+namespace Material.Styles.Converters {
+    public class DatePickerTextConverter : IMultiValueConverter {
         public static DatePickerTextConverter Instance { get; } = new();
 
-        public object Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
-        {
-            try
-            {
+        public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture) {
+            try {
                 return values[0] is UnsetValueType || values[0] == null
-                    ? "Not selected"
+                    ? values[2]
                     : values[0] is DateTimeOffset offset
                         ? offset.ToString(values[1] as string)
                         : BindingOperations.DoNothing;
             }
-            catch
-            {
+            catch {
                 return BindingOperations.DoNothing;
             }
         }

diff --git a/Material.Styles/Resources/Themes/DatePicker.axaml b/Material.Styles/Resources/Themes/DatePicker.axaml
@@ -9,6 +9,8 @@
     </StackPanel>
   </Design.PreviewWith>
 
+  <x:String x:Key="MaterialDatePickerNotSelectedText">Not selected</x:String>
+
   <ControlTheme x:Key="MaterialDatePicker" TargetType="DatePicker">
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="Transparent" />
@@ -37,6 +39,7 @@
               <MultiBinding Converter="{x:Static converters:DatePickerTextConverter.Instance}">
                 <TemplateBinding Property="SelectedDate" />
                 <TemplateBinding Property="assists:DatePickerAssist.DateTimeFormat" />
+                <DynamicResource ResourceKey="MaterialDatePickerNotSelectedText" />
               </MultiBinding>
             </TextBox.Text>
             <TextBox.InnerRightContent>