From 6f5f1da40317d5a0fcde1cca38d25c911dbe24c1 Mon Sep 17 00:00:00 2001
From: Ariel De Los Santos <ariel.delossantos@nventive.com>
Date: Tue, 19 Sep 2023 12:58:02 -0400
Subject: [PATCH 1/3] feat: add lightweight styling to DatePicker

---
 .../Uno.Themes.WinUI.Markup/Theme.Styles.cs   |   6 -
 .../Theme/DatePicker.cs                       | 154 ++++++++++++++++++
 2 files changed, 154 insertions(+), 6 deletions(-)
 create mode 100644 src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs b/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs
index b689f2351..d58ef4552 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme.Styles.cs
@@ -38,12 +38,6 @@ public static class ContentDialog
 				public static StaticResourceKey<Style> Default => new("ContentDialogStyle");
 			}
 
-			public static class DatePicker
-			{
-				[ResourceKeyDefinition(typeof(Style), "DatePickerStyle", TargetType = typeof(DatePicker))]
-				public static StaticResourceKey<Style> Default => new("DatePickerStyle");
-			}
-
 			public static class FlyoutPresenter
 			{
 				[ResourceKeyDefinition(typeof(Style), "FlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
new file mode 100644
index 000000000..3256a7bbb
--- /dev/null
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
@@ -0,0 +1,154 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup.Internals;
+
+namespace Uno.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static class DatePicker
+		{
+			public static class Resources
+			{
+				public static class FlyoutButton
+				{
+					public static class Background
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutButtonBackground")]
+						public static ResourceValue<Brush> Default => new("DatePickerFlyoutButtonBackground", true);
+					}
+				}
+
+				public static class FlyoutPresenter
+				{
+					public static class Background
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBackground")]
+						public static ResourceValue<Brush> Default => new("DatePickerFlyoutPresenterBackground", true);
+					}
+
+					public static class BorderBrush
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBorderBrush")]
+						public static ResourceValue<Brush> Default => new("DatePickerFlyoutPresenterBorderBrush", true);
+					}
+
+					public static class SpacerFill
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterSpacerFill")]
+						public static ResourceValue<Brush> Default => new("DatePickerFlyoutPresenterSpacerFill", true);
+					}
+
+					public static class HighlightFill
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterHighlightFill")]
+						public static ResourceValue<Brush> Default => new("DatePickerFlyoutPresenterHighlightFill", true);
+					}
+
+					public static class ContainerCornerRadius
+					{
+						[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")]
+						public static ResourceValue<CornerRadius> Default => new("DatePickerFlyoutPresenterCornerRadius", true);
+					}
+
+					public static class Typography
+					{
+						[ResourceKeyDefinition(typeof(FontFamily), "DatePickerFlyoutPresenterFontFamily")]
+						public static ResourceValue<FontFamily> FontFamily => new("DatePickerFlyoutPresenterFontFamily", true);
+
+						[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterFontSize")]
+						public static ResourceValue<double> FontSize => new("DatePickerFlyoutPresenterFontSize", true);
+					}
+				}
+
+				public static class Button
+				{
+					public static class Background
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackground")]
+						public static ResourceValue<Brush> Default => new("DatePickerButtonBackground", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPointerOver")]
+						public static ResourceValue<Brush> PointerOver => new("DatePickerButtonBackgroundPointerOver", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPressed")]
+						public static ResourceValue<Brush> Pressed => new("DatePickerButtonBackgroundPressed", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundDisabled")]
+						public static ResourceValue<Brush> Disabled => new("DatePickerButtonBackgroundDisabled", true);
+					}
+
+					public static class Foreground
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")]
+						public static ResourceValue<Brush> Default => new("DatePickerButtonForeground", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPointerOver")]
+						public static ResourceValue<Brush> PointerOver => new("DatePickerButtonForegroundPointerOver", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPressed")]
+						public static ResourceValue<Brush> Pressed => new("DatePickerButtonForegroundPressed", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundDisabled")]
+						public static ResourceValue<Brush> Disabled => new("DatePickerButtonForegroundDisabled", true);
+					}
+
+					public static class BorderBrush
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrush")]
+						public static ResourceValue<Brush> Default => new("DatePickerButtonBorderBrush", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPointerOver")]
+						public static ResourceValue<Brush> PointerOver => new("DatePickerButtonBorderBrushPointerOver", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPressed")]
+						public static ResourceValue<Brush> Pressed => new("DatePickerButtonBorderBrushPressed", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushDisabled")]
+						public static ResourceValue<Brush> Disabled => new("DatePickerButtonBorderBrushDisabled", true);
+					}
+
+					public static class ContainerCornerRadius
+					{
+						[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")]
+						public static ResourceValue<CornerRadius> Default => new("DatePickerFlyoutPresenterCornerRadius", true);
+					}
+				}
+
+				public static class ButtonDateText
+				{
+					public static class Foreground
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForeground")]
+						public static ResourceValue<Brush> Default => new("DatePickerButtonDateTextForeground", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPointerOver")]
+						public static ResourceValue<Brush> PointerOver => new("DatePickerButtonDateTextForegroundPointerOver", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPressed")]
+						public static ResourceValue<Brush> Pressed => new("DatePickerButtonDateTextForegroundPressed", true);
+
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundDisabled")]
+						public static ResourceValue<Brush> Disabled => new("DatePickerButtonDateTextForegroundDisabled", true);
+					}
+				}
+
+				public static class PlaceholderText
+				{
+					public static class Foreground
+					{
+						[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
+						public static ResourceValue<Brush> Default => new("DatePickerPlaceholderTextForeground", true);
+					}
+				}
+			}
+
+			public static class Styles
+			{
+				[ResourceKeyDefinition(typeof(Style), "DatePickerStyle", TargetType = typeof(DatePicker))]
+				public static ResourceValue<Style> Default => new("DatePickerStyle");
+			}
+		}
+	}
+}

From 5d03c6d0abf3f6c65a12b66fc0b59957ac1a8f07 Mon Sep 17 00:00:00 2001
From: Steve Bilogan <steve.bilogan@gmail.com>
Date: Thu, 28 Sep 2023 12:46:30 -0400
Subject: [PATCH 2/3] refactor: Use Statc/ThemeResourceKey

---
 .../Theme/DatePicker.cs                       | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
index 3256a7bbb..50c8e3379 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup;
 using Uno.Extensions.Markup.Internals;
 
 namespace Uno.Themes.Markup
@@ -16,7 +17,7 @@ public static class FlyoutButton
 					public static class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutButtonBackground")]
-						public static ResourceValue<Brush> Default => new("DatePickerFlyoutButtonBackground", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutButtonBackground");
 					}
 				}
 
@@ -25,40 +26,40 @@ public static class FlyoutPresenter
 					public static class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBackground")]
-						public static ResourceValue<Brush> Default => new("DatePickerFlyoutPresenterBackground", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterBackground");
 					}
 
 					public static class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterBorderBrush")]
-						public static ResourceValue<Brush> Default => new("DatePickerFlyoutPresenterBorderBrush", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterBorderBrush");
 					}
 
 					public static class SpacerFill
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterSpacerFill")]
-						public static ResourceValue<Brush> Default => new("DatePickerFlyoutPresenterSpacerFill", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterSpacerFill");
 					}
 
 					public static class HighlightFill
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutPresenterHighlightFill")]
-						public static ResourceValue<Brush> Default => new("DatePickerFlyoutPresenterHighlightFill", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterHighlightFill");
 					}
 
 					public static class ContainerCornerRadius
 					{
 						[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")]
-						public static ResourceValue<CornerRadius> Default => new("DatePickerFlyoutPresenterCornerRadius", true);
+						public static ThemeResourceKey<CornerRadius> Default => new("DatePickerFlyoutPresenterCornerRadius");
 					}
 
 					public static class Typography
 					{
 						[ResourceKeyDefinition(typeof(FontFamily), "DatePickerFlyoutPresenterFontFamily")]
-						public static ResourceValue<FontFamily> FontFamily => new("DatePickerFlyoutPresenterFontFamily", true);
+						public static ThemeResourceKey<FontFamily> FontFamily => new("DatePickerFlyoutPresenterFontFamily");
 
 						[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterFontSize")]
-						public static ResourceValue<double> FontSize => new("DatePickerFlyoutPresenterFontSize", true);
+						public static ThemeResourceKey<double> FontSize => new("DatePickerFlyoutPresenterFontSize");
 					}
 				}
 
@@ -67,52 +68,52 @@ public static class Button
 					public static class Background
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackground")]
-						public static ResourceValue<Brush> Default => new("DatePickerButtonBackground", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonBackground");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPointerOver")]
-						public static ResourceValue<Brush> PointerOver => new("DatePickerButtonBackgroundPointerOver", true);
+						public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonBackgroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundPressed")]
-						public static ResourceValue<Brush> Pressed => new("DatePickerButtonBackgroundPressed", true);
+						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonBackgroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackgroundDisabled")]
-						public static ResourceValue<Brush> Disabled => new("DatePickerButtonBackgroundDisabled", true);
+						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBackgroundDisabled");
 					}
 
 					public static class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")]
-						public static ResourceValue<Brush> Default => new("DatePickerButtonForeground", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPointerOver")]
-						public static ResourceValue<Brush> PointerOver => new("DatePickerButtonForegroundPointerOver", true);
+						public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonForegroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundPressed")]
-						public static ResourceValue<Brush> Pressed => new("DatePickerButtonForegroundPressed", true);
+						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonForegroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForegroundDisabled")]
-						public static ResourceValue<Brush> Disabled => new("DatePickerButtonForegroundDisabled", true);
+						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonForegroundDisabled");
 					}
 
 					public static class BorderBrush
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrush")]
-						public static ResourceValue<Brush> Default => new("DatePickerButtonBorderBrush", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonBorderBrush");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPointerOver")]
-						public static ResourceValue<Brush> PointerOver => new("DatePickerButtonBorderBrushPointerOver", true);
+						public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonBorderBrushPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushPressed")]
-						public static ResourceValue<Brush> Pressed => new("DatePickerButtonBorderBrushPressed", true);
+						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonBorderBrushPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBorderBrushDisabled")]
-						public static ResourceValue<Brush> Disabled => new("DatePickerButtonBorderBrushDisabled", true);
+						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBorderBrushDisabled");
 					}
 
 					public static class ContainerCornerRadius
 					{
 						[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")]
-						public static ResourceValue<CornerRadius> Default => new("DatePickerFlyoutPresenterCornerRadius", true);
+						public static ThemeResourceKey<CornerRadius> Default => new("DatePickerFlyoutPresenterCornerRadius");
 					}
 				}
 
@@ -121,16 +122,16 @@ public static class ButtonDateText
 					public static class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForeground")]
-						public static ResourceValue<Brush> Default => new("DatePickerButtonDateTextForeground", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonDateTextForeground");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPointerOver")]
-						public static ResourceValue<Brush> PointerOver => new("DatePickerButtonDateTextForegroundPointerOver", true);
+						public static ThemeResourceKey<Brush> PointerOver => new("DatePickerButtonDateTextForegroundPointerOver");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundPressed")]
-						public static ResourceValue<Brush> Pressed => new("DatePickerButtonDateTextForegroundPressed", true);
+						public static ThemeResourceKey<Brush> Pressed => new("DatePickerButtonDateTextForegroundPressed");
 
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundDisabled")]
-						public static ResourceValue<Brush> Disabled => new("DatePickerButtonDateTextForegroundDisabled", true);
+						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonDateTextForegroundDisabled");
 					}
 				}
 
@@ -139,7 +140,7 @@ public static class PlaceholderText
 					public static class Foreground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
-						public static ResourceValue<Brush> Default => new("DatePickerPlaceholderTextForeground", true);
+						public static ThemeResourceKey<Brush> Default => new("DatePickerPlaceholderTextForeground");
 					}
 				}
 			}
@@ -147,7 +148,7 @@ public static class Foreground
 			public static class Styles
 			{
 				[ResourceKeyDefinition(typeof(Style), "DatePickerStyle", TargetType = typeof(DatePicker))]
-				public static ResourceValue<Style> Default => new("DatePickerStyle");
+				public static StaticResourceKey<Style> Default => new("DatePickerStyle");
 			}
 		}
 	}

From 4194c6a45fb3110ccd8db3537e778f7f64668f5e Mon Sep 17 00:00:00 2001
From: Steve Bilogan <steve.bilogan@gmail.com>
Date: Thu, 28 Sep 2023 13:19:16 -0400
Subject: [PATCH 3/3] refactor: rework structure

---
 .../Theme/DatePicker.cs                       | 109 +++++++++++++-----
 1 file changed, 77 insertions(+), 32 deletions(-)

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
index 50c8e3379..3c3add7b8 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
@@ -12,16 +12,7 @@ public static class DatePicker
 		{
 			public static class Resources
 			{
-				public static class FlyoutButton
-				{
-					public static class Background
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutButtonBackground")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutButtonBackground");
-					}
-				}
-
-				public static class FlyoutPresenter
+				public static class Flyout
 				{
 					public static class Background
 					{
@@ -47,12 +38,6 @@ public static class HighlightFill
 						public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutPresenterHighlightFill");
 					}
 
-					public static class ContainerCornerRadius
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> Default => new("DatePickerFlyoutPresenterCornerRadius");
-					}
-
 					public static class Typography
 					{
 						[ResourceKeyDefinition(typeof(FontFamily), "DatePickerFlyoutPresenterFontFamily")]
@@ -61,6 +46,56 @@ public static class Typography
 						[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterFontSize")]
 						public static ThemeResourceKey<double> FontSize => new("DatePickerFlyoutPresenterFontSize");
 					}
+
+					public static class Button
+					{
+						public static class Background
+						{
+							[ResourceKeyDefinition(typeof(Brush), "DatePickerFlyoutButtonBackground")]
+							public static ThemeResourceKey<Brush> Default => new("DatePickerFlyoutButtonBackground");
+						}
+
+						public static class Opacity
+						{
+							[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutButtonOpacityPressed")]
+							public static ThemeResourceKey<double> Pressed => new("DatePickerFlyoutButtonOpacityPressed");
+
+							[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutButtonOpacityDisabled")]
+							public static ThemeResourceKey<double> Disabled => new("DatePickerFlyoutButtonOpacityDisabled");
+						}
+
+						[ResourceKeyDefinition(typeof(Thickness), "DatePickerFlyoutButtonPadding")]
+						public static ThemeResourceKey<Thickness> Padding => new("DatePickerFlyoutButtonPadding");
+					}
+
+
+
+
+					[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")]
+					public static ThemeResourceKey<CornerRadius> CornerRadius => new("DatePickerFlyoutPresenterCornerRadius");
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutBorderThickness")]
+					public static ThemeResourceKey<double> BorderThickness => new("DatePickerFlyoutBorderThickness");
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutElevation")]
+					public static ThemeResourceKey<double> Elevation => new("DatePickerFlyoutElevation");
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterWidth")]
+					public static ThemeResourceKey<double> Width => new("DatePickerFlyoutPresenterWidth");
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterMinWidth")]
+					public static ThemeResourceKey<double> MinWidth => new("DatePickerFlyoutPresenterMinWidth");
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterMaxHeight")]
+					public static ThemeResourceKey<double> MaxHeight => new("DatePickerFlyoutPresenterMaxHeight");
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterAcceptDismissHostGridHeight")]
+					public static ThemeResourceKey<double> AcceptDismissHostGridHeight => new("DatePickerFlyoutPresenterAcceptDismissHostGridHeight");
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerFlyoutPresenterHighlightHeight")]
+					public static ThemeResourceKey<double> HighlightHeight => new("DatePickerFlyoutPresenterHighlightHeight");
+
+
 				}
 
 				public static class Button
@@ -110,16 +145,7 @@ public static class BorderBrush
 						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonBorderBrushDisabled");
 					}
 
-					public static class ContainerCornerRadius
-					{
-						[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerFlyoutPresenterCornerRadius")]
-						public static ThemeResourceKey<CornerRadius> Default => new("DatePickerFlyoutPresenterCornerRadius");
-					}
-				}
-
-				public static class ButtonDateText
-				{
-					public static class Foreground
+					public static class DateTextForeground
 					{
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForeground")]
 						public static ThemeResourceKey<Brush> Default => new("DatePickerButtonDateTextForeground");
@@ -133,16 +159,35 @@ public static class Foreground
 						[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonDateTextForegroundDisabled")]
 						public static ThemeResourceKey<Brush> Disabled => new("DatePickerButtonDateTextForegroundDisabled");
 					}
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerButtonBottomBorderHeight")]
+					public static ThemeResourceKey<double> BottomBorderHeight => new("DatePickerButtonBottomBorderHeight");
+
+					[ResourceKeyDefinition(typeof(double), "DatePickerButtonContentHeight")]
+					public static ThemeResourceKey<double> ContentHeight => new("DatePickerButtonContentHeight");
+
+					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonHeaderMargin")]
+					public static ThemeResourceKey<Thickness> HeaderMargin => new("DatePickerButtonHeaderMargin");
+
+					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonPlaceholderMargin")]
+					public static ThemeResourceKey<Thickness> PlaceholderMargin => new("DatePickerButtonPlaceholderMargin");
+
+					[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonContentMargin")]
+					public static ThemeResourceKey<Thickness> ContentMargin => new("DatePickerButtonContentMargin");
+
 				}
 
-				public static class PlaceholderText
+				public static class PlaceholderForeground
 				{
-					public static class Foreground
-					{
-						[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
-						public static ThemeResourceKey<Brush> Default => new("DatePickerPlaceholderTextForeground");
-					}
+					[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
+					public static ThemeResourceKey<Brush> Default => new("DatePickerPlaceholderTextForeground");
 				}
+
+				[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("DatePickerCornerRadius");
+
+				[ResourceKeyDefinition(typeof(Thickness), "DatePickerHostPadding")]
+				public static ThemeResourceKey<Thickness> HostPadding => new("DatePickerHostPadding");
 			}
 
 			public static class Styles