From 24b67f77f22f12c8ff232a6773a9c6366c84a7ad Mon Sep 17 00:00:00 2001
From: SKProCH <skproch@yandex.ru>
Date: Wed, 12 Jul 2023 00:44:29 +0300
Subject: [PATCH] Apply some fixes and return back Calendar styles, migrate
 DatePicker to ControlThemes #234. Fix #253

---
 Material.Styles/MaterialToolKit.xaml          | 10 +-
 .../Resources/Themes/CalendarButton.axaml     |  1 -
 .../Resources/Themes/CalendarDayButton.axaml  |  1 -
 .../Resources/Themes/DatePicker.axaml         | 97 +++++++++++++++++++
 4 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 Material.Styles/Resources/Themes/DatePicker.axaml

diff --git a/Material.Styles/MaterialToolKit.xaml b/Material.Styles/MaterialToolKit.xaml
index 9c8a73f2..c07c0573 100644
--- a/Material.Styles/MaterialToolKit.xaml
+++ b/Material.Styles/MaterialToolKit.xaml
@@ -17,11 +17,11 @@
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/Button.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/ButtonSpinner.axaml" />
-        <!-- TODO: Fix Calendar styles and return it -->
-        <!-- <ResourceInclude Source="avares://Material.Styles/Resources/Themes/Calendar.axaml" /> -->
-        <!-- <ResourceInclude Source="avares://Material.Styles/Resources/Themes/CalendarButton.axaml" /> -->
-        <!-- <ResourceInclude Source="avares://Material.Styles/Resources/Themes/CalendarDayButton.axaml" /> -->
-        <!-- <ResourceInclude Source="avares://Material.Styles/Resources/Themes/CalendarItem.axaml" /> -->
+        <ResourceInclude Source="avares://Material.Styles/Resources/Themes/DatePicker.axaml" />
+        <ResourceInclude Source="avares://Material.Styles/Resources/Themes/Calendar.axaml" />
+        <ResourceInclude Source="avares://Material.Styles/Resources/Themes/CalendarButton.axaml" />
+        <ResourceInclude Source="avares://Material.Styles/Resources/Themes/CalendarDayButton.axaml" />
+        <ResourceInclude Source="avares://Material.Styles/Resources/Themes/CalendarItem.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/ColorZone.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/FloatingButton.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/ToggleSwitch.axaml" />
diff --git a/Material.Styles/Resources/Themes/CalendarButton.axaml b/Material.Styles/Resources/Themes/CalendarButton.axaml
index d1e1c274..38dc5707 100644
--- a/Material.Styles/Resources/Themes/CalendarButton.axaml
+++ b/Material.Styles/Resources/Themes/CalendarButton.axaml
@@ -9,7 +9,6 @@
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
     <Setter Property="BorderThickness" Value="2" />
-    <Setter Property="FontSize" Value="20" />
     <Setter Property="ClipToBounds" Value="False" />
     <Setter Property="HorizontalAlignment" Value="Center" />
     <Setter Property="VerticalAlignment" Value="Center" />
diff --git a/Material.Styles/Resources/Themes/CalendarDayButton.axaml b/Material.Styles/Resources/Themes/CalendarDayButton.axaml
index d8bc331b..790065dd 100644
--- a/Material.Styles/Resources/Themes/CalendarDayButton.axaml
+++ b/Material.Styles/Resources/Themes/CalendarDayButton.axaml
@@ -11,7 +11,6 @@
     <Setter Property="Background" Value="Transparent" />
     <Setter Property="BorderBrush" Value="Transparent" />
     <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="FontSize" Value="20" />
     <Setter Property="IsVisible" Value="True" />
     <Setter Property="Padding" Value="2" />
     <Setter Property="ClipToBounds" Value="False" />
diff --git a/Material.Styles/Resources/Themes/DatePicker.axaml b/Material.Styles/Resources/Themes/DatePicker.axaml
new file mode 100644
index 00000000..57ed0ee3
--- /dev/null
+++ b/Material.Styles/Resources/Themes/DatePicker.axaml
@@ -0,0 +1,97 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:assists="clr-namespace:Material.Styles.Assists"
+                    xmlns:naming="clr-namespace:Material.Styles.Resources.Naming"
+                    xmlns:converters="clr-namespace:Material.Styles.Converters"
+                    xmlns:controls="clr-namespace:Material.Styles.Controls">
+  <Design.PreviewWith>
+    <StackPanel Margin="20 20 200 1000">
+      <DatePicker />
+    </StackPanel>
+  </Design.PreviewWith>
+
+  <ControlTheme x:Key="MaterialDatePicker" TargetType="DatePicker">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="assists:TextFieldAssist.Label" Value="Date" />
+
+    <Setter Property="MonthFormat" Value="MMMM" />
+    <Setter Property="DayFormat" Value=" dd" />
+    <Setter Property="YearFormat" Value=", yyyy" />
+    <Setter Property="assists:DatePickerAssist.DateTimeFormat" Value="dd MMMM yyyy" />
+
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Panel>
+          <!-- This controls required by avalonia code behind -->
+          <TextBlock IsVisible="False" IsTabStop="False" Height="0" Width="0" Name="{x:Static naming:PartNames.AvaloniaDayText}" />
+          <TextBlock IsVisible="False" IsTabStop="False" Height="0" Width="0" Name="{x:Static naming:PartNames.AvaloniaMonthText}" />
+          <TextBlock IsVisible="False" IsTabStop="False" Height="0" Width="0" Name="{x:Static naming:PartNames.AvaloniaYearText}" />
+
+          <!-- TODO: Make TextBox writeable -->
+          <!-- TODO: allow use different text boxes style-->
+          <TextBox Name="DisplayTextBox"
+                   assists:TextFieldAssist.Label="{TemplateBinding assists:TextFieldAssist.Label}">
+            <TextBox.Text>
+              <MultiBinding Converter="{x:Static converters:DatePickerTextConverter.Instance}">
+                <TemplateBinding Property="SelectedDate" />
+                <TemplateBinding Property="assists:DatePickerAssist.DateTimeFormat" />
+              </MultiBinding>
+            </TextBox.Text>
+            <TextBox.InnerRightContent>
+              <ToggleButton Name="CalendarButton"
+                            Classes="Icon"
+                            Width="36"
+                            Height="36"
+                            Margin="8 8 8 6">
+                <controls:MaterialInternalIcon Kind="Calendar"
+                                               Width="20"
+                                               Height="20" />
+              </ToggleButton>
+            </TextBox.InnerRightContent>
+          </TextBox>
+          <Panel Name="PART_PopupContainer">
+            <Popup Name="PART_CalendarPopup"
+                   IsOpen="{Binding #CalendarButton.IsChecked, Mode=TwoWay}">
+              <controls:Card Name="{x:Static naming:PartNames.PartCard}">
+                <Calendar
+                  SelectedDate="{TemplateBinding SelectedDate, 
+                                    Mode=TwoWay, Converter={x:Static converters:DateTimeOffsetConverter.Instance}}" />
+              </controls:Card>
+            </Popup>
+          </Panel>
+        </Panel>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^ /template/ Panel#PART_PopupContainer">
+      <Setter Property="Margin" Value="-8" />
+    </Style>
+
+    <Style Selector="^ /template/ Popup#PART_CalendarPopup">
+      <Setter Property="VerticalOffset" Value="-16" />
+      <Setter Property="IsLightDismissEnabled" Value="True" />
+    </Style>
+
+    <Style Selector="^ /template/ Popup#PART_CalendarPopup > controls|Card#PART_Card">
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="Margin" Value="8" />
+    </Style>
+
+    <Style Selector="^ /template/ TextBox#DisplayTextBox">
+      <Setter Property="Margin" Value="0" />
+      <Setter Property="IsReadOnly" Value="True" />
+      <Setter Property="UseFloatingWatermark" Value="True" />
+    </Style>
+
+    <Style Selector="^.multiselect /template/ Popup#PART_CalendarPopup Calendar">
+      <Setter Property="SelectionMode" Value="MultipleRange" />
+    </Style>
+  </ControlTheme>
+  
+  <!-- Default theme -->
+  <ControlTheme x:Key="{x:Type DatePicker}" TargetType="DatePicker" 
+                BasedOn="{StaticResource MaterialDatePicker}" />
+</ResourceDictionary>