Merge pull request #89 from l1pton17/DateTimePickerAnimation

Animate DatePicker

Author: ButchersBoy

MaterialDesignThemes.Wpf/MaterialDateDisplay.cs

@@ -22,7 +22,7 @@ public class MaterialDateDisplay : Control
         private readonly IDictionary<char, string> _formats = new Dictionary<char, string>
             {
                 {'d', "dd"},
-                {'m', "MMM"},
+                {'m', "ddd, MMM"},
                 {'y', "yyyy"}
             };
 
@@ -122,7 +122,7 @@ private void UpdateComponents()
             {
 	            if (component.index == 0)
 		            IsDayInFirstComponent = component.code == 'd';
-				_setters[component.index](DisplayDate.ToString(_formats[component.code], CultureInfo.CurrentUICulture).ToUpper());
+				_setters[component.index](DisplayDate.ToString(_formats[component.code], CultureInfo.CurrentUICulture).ToTitleCase());
             }					       
         }
 

MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

@@ -251,6 +251,7 @@
     <Compile Include="RatingBar.cs" />
     <Compile Include="RatingBarButton.cs" />
     <Compile Include="ShadowAssist.cs" />
+    <Compile Include="StringExtensions.cs" />
     <Compile Include="TextFieldAssist.cs" />
     <Compile Include="Converters\TextFieldHintVisibilityConverter.cs" />
     <Compile Include="TimePicker.cs" />

MaterialDesignThemes.Wpf/StringExtensions.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MaterialDesignThemes.Wpf
+{
+    internal static class StringExtensions
+    {
+        public static string ToTitleCase(this string text, string separator = " ")
+        {
+            TextInfo textInfo = CultureInfo.CurrentUICulture.TextInfo;
+
+            string lowerText = textInfo.ToLower(text);
+            string[] words = lowerText.Split(new[] { separator }, StringSplitOptions.None);
+
+            return String.Join(separator, words.Select(v => textInfo.ToTitleCase(v)));
+        }
+    }
+}

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -202,34 +202,33 @@
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
-                        <StackPanel>
-                            <TextBlock Text="{TemplateBinding ComponentOneContent}" HorizontalAlignment="Center" Margin="0 12 0 0" FontSize="24" FontWeight="Normal" />
-                            <TextBlock Text="{TemplateBinding ComponentTwoContent}" HorizontalAlignment="Center" Margin="0 -6 0 0" FontSize="60" FontWeight="Normal" />
-                            <TextBlock Text="{TemplateBinding ComponentThreeContent}" HorizontalAlignment="Center" Margin="0 -4 0 10" FontSize="24" Opacity=".56" FontWeight="Normal" />
+                        <StackPanel Orientation="Vertical"
+                                    Margin="0">
+                            <TextBlock x:Name="ComponentThreeTextBlock"
+                                       Text="{TemplateBinding ComponentThreeContent}"
+                                       HorizontalAlignment="Left"
+                                       FontSize="15" FontWeight="Normal" />
+                            <StackPanel x:Name="ComponentOneTwoWrapper" Orientation="Horizontal"
+                                        HorizontalAlignment="Left">
+                                <TextBlock Text="{TemplateBinding ComponentTwoContent}" FontSize="30" FontWeight="Normal" />
+                                <TextBlock Text="{TemplateBinding ComponentOneContent}" Margin="10 0 0 0" FontSize="30" FontWeight="Normal" />
+                            </StackPanel>
                         </StackPanel>
                     </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsDayInFirstComponent" Value="True">
+                            <Setter TargetName="ComponentThreeTextBlock" Property="Opacity" Value=".56"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="ComponentThreeTextBlock" Property="Opacity" Value="1"/>
+                            <Setter TargetName="ComponentOneTwoWrapper" Property="Opacity" Value=".56"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
 		<Style.Triggers>
-			<Trigger Property="IsDayInFirstComponent" Value="True">
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="{x:Type local:MaterialDateDisplay}">
-							<Border Background="{TemplateBinding Background}"
-									BorderBrush="{TemplateBinding BorderBrush}"
-									BorderThickness="{TemplateBinding BorderThickness}">
-								<StackPanel>
-									<TextBlock Text="{TemplateBinding ComponentOneContent}" HorizontalAlignment="Center" Margin="0 4 0 0" FontSize="60" FontWeight="Normal" />
-									<TextBlock Text="{TemplateBinding ComponentTwoContent}" HorizontalAlignment="Center" Margin="0 -4 0 0" FontSize="24" FontWeight="Normal" />
-									<TextBlock Text="{TemplateBinding ComponentThreeContent}" HorizontalAlignment="Center" Margin="0 4 0 10" FontSize="24" Opacity=".56" FontWeight="Normal" />
-								</StackPanel>
-							</Border>
-						</ControlTemplate>
-					</Setter.Value>					
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
+        </Style.Triggers>
     </Style>
 
     <Style TargetType="{x:Type local:ListSortDirectionIndicator}">