Update ControlThemes

Material.Styles/MaterialToolKit.xaml

@@ -14,6 +14,7 @@
         <!-- Seems like we cant reference something from other projects... -->
         <!-- I think what we need to move ripple to this project -->
         <ResourceInclude Source="avares://Material.Ripple/Theme.axaml" />
+        <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" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/ToggleSwitch.axaml" />
@@ -36,6 +37,7 @@
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/NativeMenuBar.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/NavigationDrawer.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/NotificationCard.axaml" />
+        <ResourceInclude Source="avares://Material.Styles/Resources/Themes/NumericUpDown.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/OverlayPopupHost.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/PopupRoot.axaml" />
         <ResourceInclude Source="avares://Material.Styles/Resources/Themes/ListBoxItem.axaml" />
@@ -98,7 +100,7 @@
 
   <!-- Uncommented -->
 
-  <StyleInclude Source="avares://Material.Styles/AutoCompleteBox.xaml" />
+  <!-- <StyleInclude Source="avares://Material.Styles/AutoCompleteBox.xaml" /> -->
   <StyleInclude Source="avares://Material.Styles/CalendarButton.xaml" />
   <StyleInclude Source="avares://Material.Styles/CalendarDayButton.xaml" />
   <StyleInclude Source="avares://Material.Styles/CalendarItem.xaml" />
@@ -128,7 +130,7 @@
   <StyleInclude Source="avares://Material.Styles/MenuItem.xaml" />
   <!-- <StyleInclude Source="avares://Material.Styles/NativeMenuBar.xaml" /> -->
   <!-- <StyleInclude Source="avares://Material.Styles/NotificationCard.xaml" /> -->
-  <StyleInclude Source="avares://Material.Styles/NumericUpDown.xaml" />
+  <!-- <StyleInclude Source="avares://Material.Styles/NumericUpDown.xaml" /> -->
   <!-- <StyleInclude Source="avares://Material.Styles/OverlayPopupHost.xaml" /> -->
   <!-- <StyleInclude Source="avares://Material.Styles/PopupRoot.xaml" /> -->
   <!-- <StyleInclude Source="avares://Material.Styles/ProgressBar.xaml" /> -->

Material.Styles/Resources/Themes/AutoCompleteBox.axaml

@@ -0,0 +1,42 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  <ControlTheme x:Key="{x:Type AutoCompleteBox}"
+                TargetType="AutoCompleteBox">
+    <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}" />
+        <!-- <Setter Property="BorderThickness" Value="0 0 0 1" /> -->
+        <Setter Property="BorderThickness" Value="1" /> <!-- FixBorderThickness -->
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Panel>
+                    <TextBox Name="PART_TextBox"
+                             Background="{TemplateBinding Background}"
+                             BorderBrush="{TemplateBinding BorderBrush}"
+                             BorderThickness="{TemplateBinding BorderThickness}"
+                             Padding="{TemplateBinding Padding}"
+                             Watermark="{TemplateBinding Watermark}"
+                             DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}" />
+
+                    <Popup Name="PART_Popup"
+                           MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                           MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                           PlacementTarget="{TemplateBinding}"
+                           IsLightDismissEnabled="True">
+                        <Border BorderBrush="{DynamicResource MaterialDesignTextAreaBorder}"
+                                BorderThickness="1">
+                            <ListBox Name="PART_SelectingItemsControl"
+                                     BorderThickness="0"
+                                     Background="{TemplateBinding Background}"
+                                     Foreground="{TemplateBinding Foreground}"
+                                     ItemTemplate="{TemplateBinding ItemTemplate}"
+                                     ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                     ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                        </Border>
+                    </Popup>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+  </ControlTheme>
+</ResourceDictionary>
+

Material.Styles/Resources/Themes/NumericUpDown.axaml

@@ -0,0 +1,73 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:assists="clr-namespace:Material.Styles.Assists"
+                    xmlns:controls="clr-namespace:Material.Styles.Controls">
+  <ControlTheme x:Key="{x:Type NumericUpDown}"
+                TargetType="NumericUpDown">
+    <Setter Property="Background" Value="{DynamicResource MaterialDesignTextFieldBoxBackground}" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="MinHeight" Value="48" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border Name="PART_RootBorder"
+                ClipToBounds="True"
+                CornerRadius="4,4,0,0"
+                Margin="{TemplateBinding Padding}"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+          <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+            <Border Name="focusBorder"
+                    Background="{DynamicResource MaterialDesignTextFieldBoxHoverBackground}" />
+            <ButtonSpinner Name="PART_Spinner"
+                           BorderThickness="0"
+                           BorderBrush="Transparent"
+                           HorizontalContentAlignment="Stretch"
+                           VerticalContentAlignment="Stretch"
+                           AllowSpin="{TemplateBinding AllowSpin}"
+                           ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                           ButtonSpinnerLocation="{TemplateBinding ButtonSpinnerLocation}">
+              <TextBox Name="PART_TextBox" Margin="8 0"
+                       BorderThickness="0" VerticalAlignment="Center"
+                       TextBlock.FontFamily="{TemplateBinding FontFamily}"
+                       TextBlock.FontSize="{TemplateBinding FontSize}"
+                       TextBlock.FontStyle="{TemplateBinding FontStyle}"
+                       TextBlock.FontWeight="{TemplateBinding FontWeight}"
+                       TextBlock.Foreground="{TemplateBinding Foreground}"
+                       assists:TextFieldAssist.Label="{TemplateBinding assists:TextFieldAssist.Label}"
+                       Watermark="{TemplateBinding Watermark}"
+                       DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                       IsReadOnly="{TemplateBinding IsReadOnly}"
+                       Text="{TemplateBinding Text}"
+                       AcceptsReturn="False" TextWrapping="NoWrap" />
+            </ButtonSpinner>
+            <controls:MaterialUnderline Classes="MirrorY"
+                                        VerticalAlignment="Bottom"
+                                        Name="Underline" />
+          </Grid>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <!-- <Style Selector="^ /template/ controls|MaterialUnderline#Underline"> -->
+    <!--   <Setter Property="Opacity" Value="0" /> -->
+    <!-- </Style> -->
+    <!-- -->
+    <!-- <Style Selector="^ /template/ TextBox#PART_TextBox"> -->
+    <!--   <Setter Property="Opacity" Value="0" /> -->
+    <!-- </Style> -->
+
+    <Style Selector="^:pointerover /template/ controls|MaterialUnderline#Underline">
+      <Setter Property="IsActive" Value="True" />
+    </Style>
+
+    <Style Selector="^:focus-within /template/ controls|MaterialUnderline#Underline">
+      <Setter Property="IsActive" Value="True" />
+    </Style>
+
+    <Style Selector="^ /template/ Border#PART_RootBorder">
+      <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignTextBoxBorder}" />
+    </Style>
+  </ControlTheme>
+</ResourceDictionary>