feat: remove header in TimePicker

samples/ControlCatalog/Pages/DateTimePickerPage.xaml

@@ -79,24 +79,24 @@
       
       <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
               BorderThickness="1" Padding="15">
-        <TimePicker Header="Pick a time">
+        <TimePicker>
           <DataValidationErrors.Error>
             <sys:Exception /> 
           </DataValidationErrors.Error>
         </TimePicker>
       </Border>
 
-      <TextBlock FontSize="18">A TimePicker with a header and minute increments specified.</TextBlock>
+      <TextBlock FontSize="18">A TimePicker with minute increments specified.</TextBlock>
       <StackPanel Orientation="Vertical">
         <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
                 BorderThickness="1" Padding="15">
-          <TimePicker Header="Arrival time" MinuteIncrement="15" />
+          <TimePicker MinuteIncrement="15" />
         </Border>
         <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
           <TextBlock Padding="15">
             <TextBlock.Text>
               <x:String>
-                &lt;TimePicker Header="Arrival time" MinuteIncrement="15" /&gt;
+                &lt;TimePicker MinuteIncrement="15" /&gt;
               </x:String>
             </TextBlock.Text>
           </TextBlock>
@@ -107,13 +107,13 @@
       <StackPanel Orientation="Vertical">
         <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
                 BorderThickness="1" Padding="15">
-          <TimePicker ClockIdentifier="12HourClock" Header="12 hour clock" />
+          <TimePicker ClockIdentifier="12HourClock"/>
         </Border>
         <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
           <TextBlock Padding="15">
             <TextBlock.Text>
               <x:String>
-                &lt;TimePicker ClockIdentifier="12HourClock" Header="12 hour clock" /&gt;
+                &lt;TimePicker ClockIdentifier="12HourClock" /&gt;
               </x:String>
             </TextBlock.Text>
           </TextBlock>
@@ -124,13 +124,13 @@
       <StackPanel Orientation="Vertical">
         <Border BorderBrush="{DynamicResource SystemControlHighlightBaseLowBrush}"
                 BorderThickness="1" Padding="15">
-          <TimePicker ClockIdentifier="24HourClock" Header="24 hour clock" />
+          <TimePicker ClockIdentifier="24HourClock" />
         </Border>
         <Panel Background="{DynamicResource SystemControlBackgroundBaseLowBrush}">
           <TextBlock Padding="15">
             <TextBlock.Text>
               <x:String>
-                &lt;TimePicker ClockIdentifier="24HourClock" Header="24 hour clock" /&gt;
+                &lt;TimePicker ClockIdentifier="24HourClock" /&gt;
               </x:String>
             </TextBlock.Text>
           </TextBlock>

src/Avalonia.Controls/DateTimePickers/TimePicker.cs

@@ -34,18 +34,6 @@ namespace Avalonia.Controls
             AvaloniaProperty.RegisterDirect<TimePicker, int>(nameof(MinuteIncrement),
                 x => x.MinuteIncrement, (x, v) => x.MinuteIncrement = v);
 
-        /// <summary>
-        /// Defines the <see cref="Header"/> property
-        /// </summary>
-        public static readonly StyledProperty<object> HeaderProperty =
-            AvaloniaProperty.Register<TimePicker, object>(nameof(Header));
-
-        /// <summary>
-        /// Defines the <see cref="HeaderTemplate"/> property
-        /// </summary>
-        public static readonly StyledProperty<IDataTemplate> HeaderTemplateProperty =
-            AvaloniaProperty.Register<TimePicker, IDataTemplate>(nameof(HeaderTemplate));
-
         /// <summary>
         /// Defines the <see cref="ClockIdentifier"/> property
         /// </summary>
@@ -103,24 +91,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Gets or sets the header
-        /// </summary>
-        public object Header
-        {
-            get => GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the header template
-        /// </summary>
-        public IDataTemplate HeaderTemplate
-        {
-            get => GetValue(HeaderTemplateProperty);
-            set => SetValue(HeaderTemplateProperty, value);
-        }
-
         /// <summary>
         /// Gets or sets the clock identifier, either 12HourClock or 24HourClock
         /// </summary>

src/Avalonia.Themes.Fluent/Controls/TimePicker.xaml

@@ -83,19 +83,8 @@
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>
-          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}" RowDefinitions="Auto,*">
-            <ContentPresenter x:Name="HeaderContentPresenter"
-                              Grid.Row="0"
-                              Content="{TemplateBinding Header}"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              Margin="{DynamicResource TimePickerTopHeaderMargin}"
-                              MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                              Foreground="{DynamicResource TimePickerHeaderForeground}"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Top" />
-
+          <Grid Name="LayoutRoot" Margin="{TemplateBinding Padding}">
             <Button x:Name="PART_FlyoutButton"
-                    Grid.Row="1"
                     Theme="{StaticResource FluentTimePickerFlyoutButton}"
                     Foreground="{TemplateBinding Foreground}"
                     Background="{TemplateBinding Background}"
@@ -172,11 +161,7 @@
         </DataValidationErrors>
       </ControlTemplate>
     </Setter>
-
-    <Style Selector="^:disabled /template/ ContentPresenter#HeaderContentPresenter">
-      <Setter Property="Foreground" Value="{DynamicResource TimePickerHeaderForegroundDisabled}"/>
-    </Style>
-
+    
     <Style Selector="^:disabled /template/ Rectangle">
       <Setter Property="Fill" Value="{DynamicResource TimePickerSpacerFillDisabled}"/>
     </Style>

src/Avalonia.Themes.Simple/Controls/TimePicker.xaml

@@ -90,20 +90,8 @@
       <ControlTemplate>
         <DataValidationErrors>
           <Grid Name="LayoutRoot"
-                Margin="{TemplateBinding Padding}"
-                RowDefinitions="Auto,*">
-            <ContentPresenter x:Name="HeaderContentPresenter"
-                              Grid.Row="0"
-                              MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
-                              Margin="{DynamicResource TimePickerTopHeaderMargin}"
-                              HorizontalAlignment="Stretch"
-                              VerticalAlignment="Top"
-                              Content="{TemplateBinding Header}"
-                              ContentTemplate="{TemplateBinding HeaderTemplate}"
-                              Foreground="{DynamicResource ThemeForegroundColor}" />
-
+                Margin="{TemplateBinding Padding}">
             <Button x:Name="PART_FlyoutButton"
-                    Grid.Row="1"
                     MinWidth="{DynamicResource TimePickerThemeMinWidth}"
                     MaxWidth="{DynamicResource TimePickerThemeMaxWidth}"
                     HorizontalAlignment="Stretch"
@@ -181,10 +169,6 @@
       </ControlTemplate>
     </Setter>
 
-    <Style Selector="^:disabled /template/ ContentPresenter#HeaderContentPresenter">
-      <Setter Property="TextElement.Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
-    </Style>
-
     <Style Selector="^:disabled /template/ Rectangle">
       <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>