diff --git a/doc/material-controls-styles.md b/doc/material-controls-styles.md
index be328da56..7d3714fe2 100644
--- a/doc/material-controls-styles.md
+++ b/doc/material-controls-styles.md
@@ -1,31 +1,47 @@
# Material Controls Styles
-Control|Style Key|WithImplicitStyles*|
+Control|Style Key|IsDefaultStyle*|
-|-|-
-AppBarButton|AppBarButtonStyle|true
+AppBarButton|AppBarButtonStyle|True|
Button|ElevatedButtonStyle|
-Button|FilledButtonStyle|true
+Button|FilledButtonStyle|True|
Button|FilledTonalButtonStyle|
Button|OutlinedButtonStyle|
Button|TextButtonStyle|
Button|IconButtonStyle|
-CalendarDatePicker|CalendarDatePickerStyle|true
-CalendarView|CalendarViewStyle|true
-CheckBox|CheckBoxStyle|true
-CommandBar|CommandBarStyle|true
-DatePicker|DatePickerStyle|true
-FlyoutPresenter|FlyoutPresenterStyle|true
-HyperlinkButton|HyperlinkButtonStyle|true
-HyperlinkButton|SecondaryHyperlinkButtonStyle
-ListView|ListViewStyle|true
-ListViewItem|ListViewItemStyle|true
-MenuFlyoutPresenter|MenuFlyoutPresenterStyle|true
-muxc:NavigationView|NavigationViewStyle|true
-muxc:NavigationViewItem|NavigationViewItemStyle|true
-PasswordBox|FilledPasswordBoxStyle|true
+Button|FabStyle|
+Button|SurfaceFabStyle|
+Button|SecondaryFabStyle|
+Button|TertiaryFabStyle|
+Button|SmallFabStyle|
+Button|SurfaceSmallFabStyle|
+Button|SecondarySmallFabStyle|
+Button|TertiarySmallFabStyle|
+Button|LargeFabStyle|
+Button|SurfaceLargeFabStyle|
+Button|SecondaryLargeFabStyle|
+Button|TertiaryLargeFabStyle|
+Button|ExtendedFabStyle|
+Button|SurfaceExtendedFabStyle|
+Button|SecondaryExtendedFabStyle|
+Button|TertiaryExtendedFabStyle|
+CalendarDatePicker|CalendarDatePickerStyle|True|
+CalendarView|CalendarViewStyle|True|
+CheckBox|CheckBoxStyle|True|
+ComboBox|ComboBoxStyle|True|
+CommandBar|CommandBarStyle|True|
+DatePicker|DatePickerStyle|True|
+FlyoutPresenter|FlyoutPresenterStyle|True|
+HyperlinkButton|HyperlinkButtonStyle|True|
+HyperlinkButton|SecondaryHyperlinkButtonStyle|
+ListView|ListViewStyle|True|
+ListViewItem|ListViewItemStyle|True|
+MenuFlyoutPresenter|MenuFlyoutPresenterStyle|True|
+muxc:NavigationView|NavigationViewStyle|True|
+muxc:NavigationViewItem|NavigationViewItemStyle|True|
+PasswordBox|FilledPasswordBoxStyle|True|
PasswordBox|OutlinedPasswordBoxStyle|
-ProgressBar|ProgressBarStyle|true
-ProgressRing|ProgressRingStyle|true
-RadioButton|RadioButtonStyle|true
+RadioButton|RadioButtonStyle|True|
+Slider|SliderStyle|True|
TextBlock|DisplayLarge|
TextBlock|DisplayMedium|
TextBlock|DisplaySmall|
@@ -39,15 +55,12 @@ TextBlock|LabelLarge|
TextBlock|LabelMedium|
TextBlock|LabelSmall|
TextBlock|BodyLarge|
-TextBlock|BodyMedium|true
+TextBlock|BodyMedium|True|
TextBlock|BodySmall|
-TextBox|FilledTextBoxStyle|true
+TextBox|FilledTextBoxStyle|True|
TextBox|OutlinedTextBoxStyle|
-ToggleButton|TextToggleButtonStyle|true
+ToggleButton|TextToggleButtonStyle|True|
ToggleButton|IconToggleButtonStyle|
-ToggleSwitch|ToggleSwitchStyle|true
+ToggleSwitch|ToggleSwitchStyle|True|
-WithImplicitStyles*: Styles in this column will be set as the default implicit styles by setting the `WithImplicitStyles` flag to `True`:
-```xml
-
-```
+IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control
diff --git a/src/library/Uno.Material/Generated/mergedpages.v2.xaml b/src/library/Uno.Material/Generated/mergedpages.v2.xaml
index ed5932afd..4dc0b59f0 100644
--- a/src/library/Uno.Material/Generated/mergedpages.v2.xaml
+++ b/src/library/Uno.Material/Generated/mergedpages.v2.xaml
@@ -1,218 +1,222 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #717171
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #717171
+ #57507C
+ #D7D7D7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- #999999
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #999999
+ #E9E5FA
+ #F7F7F7
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 40
- 48
- 16,0
- 12,0
- 20
- 14
- 7.143
-
-
-
-
-
-
-
-
-
+
- M0,0L32,0 16,19.745z
-
-
-
-
-
-
-
+
M0,0L32,0 32,5.3 0,5.3z
M28.718018,0L32,3.2819897 10.666016,24.616999 0,13.951997 3.2810059,10.670007 10.666016,18.055033z
@@ -1175,13 +1179,13 @@
40
18
4
-
-
-
-
@@ -1429,28 +1433,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
M15.995972,0L32,21.478999 0,21.478999z
M0,0L32,0 16,19.745z
- 1
- 2
-
-
- 4
- 48
-
-
- 1
- 1
- 53
-
- 24,24,8,8
-
-
- 8
-
-
-
-
+
@@ -1811,7 +1815,7 @@
-
+
@@ -1825,9 +1829,9 @@
-
-
-
+
+
+
@@ -1835,9 +1839,9 @@
-
-
-
+
+
+
@@ -1846,21 +1850,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 16
- 18
- 16
- 8
- 18
- 12
- 30
- 27
- 28
- 14
- 12
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- M30.561941,0L31.997,1.393004 10.467954,23.597999 0,15.350999 1.2379759,13.780992 10.287961,20.909952z
- M0,0L25.194,16 0,32z
- 112
- 280
- 48
- 16
- 16
- 16
- 16
- 1
- 14
- 7.143
- 38
-
-
-
-
-
-
-
-
-
-
-
-
-
- 10,0,16,0
- 12,0,12,0
- 40
- 40
- 40
- 40
- 40
- 48
- 48
- 40
- 40
- 4
- 1
- 1
- 1
- 1
- 12,0,12,0
- 10,0,0,0
- 8,5,0,0
- 12,5,0,11
- 8,4,0,0
- 0
- 0
- 16,10
- 16,10
- 10,0
- 0
- 0,0,20,0
- 0,0,0,0
- 8,0,16,0
- 12,0
- -20,0,6,0
- -16,0,0,0
- 0,0,0,0
- -12,0,0,0
- 12,0,20,0
- 16,0,20,0
- -4,0,6,0
- 12,0,12,0
- 0,8
- 0,8
- 12.0
-
-
-
-
- 0
-
- 8,2
- 16
-
+ 10,0,16,0
+ 12,0,12,0
+ 40
+ 40
+ 40
+ 40
+ 40
+ 48
+ 48
+ 40
+ 40
+ 4
+ 1
+ 1
+ 1
+ 1
+ 12,0,12,0
+ 10,0,0,0
+ 8,5,0,0
+ 12,5,0,11
+ 8,4,0,0
+ 0
+ 0
+ 16,10
+ 16,10
+ 10,0
+ 0
+ 0,0,20,0
+ 0,0,0,0
+ 8,0,16,0
+ 12,0
+ -20,0,6,0
+ -16,0,0,0
+ 0,0,0,0
+ -12,0,0,0
+ 12,0,20,0
+ 16,0,20,0
+ -4,0,6,0
+ 12,0,12,0
+ 0,8
+ 0,8
+ 12.0
+
+
+
+
+ 0
+
+ 8,2
+ 16
+
@@ -3456,51 +3460,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
- M16,5.5999984C17.699951,5.5999984 19.099976,6.9999918 19.099976,8.6999893 19.099976,10.400001 17.699951,11.799994 16,11.799994 14.299988,11.799994 12.899963,10.400001 12.899963,8.6999893 12.899963,6.9999918 14.299988,5.5999984 16,5.5999984z M16,2.1999893C12.399963,2.1999893 9.5,5.0999984 9.5,8.6999893 9.5,12.299994 12.399963,15.199988 16,15.199988 19.599976,15.199988 22.5,12.299994 22.5,8.6999893 22.5,5.0999984 19.599976,2.1999893 16,2.1999893z M16,0C24.799988,5.2249334E-08 32,8.6999893 32,8.6999893 32,8.6999893 24.799988,17.400001 16,17.400001 7.1999512,17.400001 0,8.6999893 0,8.6999893 0,8.6999893 7.1999512,5.2249334E-08 16,0z
-
-
-
-
+
+
+
+
+
+
+
+
40
40
18
2
-
-
-
-
@@ -5051,12 +5074,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 4
- 14
- 16,8
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/library/Uno.Material/MaterialResourcesV2.cs b/src/library/Uno.Material/MaterialResourcesV2.cs
index 4c72af4cf..bbb5daa7c 100644
--- a/src/library/Uno.Material/MaterialResourcesV2.cs
+++ b/src/library/Uno.Material/MaterialResourcesV2.cs
@@ -15,9 +15,7 @@ namespace Uno.Material
///
public class MaterialResourcesV2 : ResourceDictionary
{
- private const string StylePrefix = "M3Material";
- private ResourceDictionary _implicitResources = new ResourceDictionary();
-
+ private const string StylePrefix = "Material";
public MaterialResourcesV2()
{
Source = new Uri("ms-appx:///Uno.Material/Generated/mergedpages.v2.xaml");
@@ -25,18 +23,18 @@ public MaterialResourcesV2()
MapStyleInfo();
}
- public bool WithImplicitStyles { set => ExportImplicitStyles(value); }
-
private void MapStyleInfo()
{
var aliasedResources = new ResourceDictionary();
+ var implicitResources = new ResourceDictionary();
+
foreach (var (resKey, sharedKey, isDefaultStyle) in GetStyleInfos())
{
var style = GetStyle(resKey);
if (isDefaultStyle)
{
- _implicitResources.Add(style.TargetType, style);
+ implicitResources.Add(style.TargetType, style);
}
aliasedResources.Add(sharedKey, style);
@@ -46,13 +44,7 @@ private void MapStyleInfo()
// > Local values are not allowed in resource dictionary with Source set
// but, we can add them through merged-dict instead.
this.MergedDictionaries.Add(aliasedResources);
- }
-
- private void ExportImplicitStyles(bool value)
- {
- if (!value) return; // we don't support teardown
-
- this.MergedDictionaries.Add(_implicitResources);
+ this.MergedDictionaries.Add(implicitResources);
}
private Style GetStyle(string key)
@@ -77,69 +69,70 @@ private IEnumerable<(string ResourceKey, string SharedKey, bool IsDefaultStyle)>
{
var result = new List<(string ResourceKey, string SharedKey, bool IsDefaultStyle)>();
- Add("M3MaterialCheckBoxStyle", isImplicit: true);
- Add("M3MaterialAppBarButtonStyle", isImplicit: true);
- Add("M3MaterialCommandBarStyle", isImplicit: true);
- Add("M3MaterialRadioButtonStyle", isImplicit: true);
- Add("M3MaterialDisplayLarge");
- Add("M3MaterialDisplayMedium");
- Add("M3MaterialDisplaySmall");
- Add("M3MaterialHeadlineLarge");
- Add("M3MaterialHeadlineMedium");
- Add("M3MaterialHeadlineSmall");
- Add("M3MaterialTitleLarge");
- Add("M3MaterialTitleMedium");
- Add("M3MaterialTitleSmall");
- Add("M3MaterialLabelLarge");
- Add("M3MaterialLabelMedium");
- Add("M3MaterialLabelSmall");
- Add("M3MaterialBodyLarge");
- Add("M3MaterialBodyMedium", isImplicit: true);
- Add("M3MaterialBodySmall");
- Add("M3MaterialOutlinedTextBoxStyle");
- Add("M3MaterialFilledTextBoxStyle", isImplicit: true);
- Add("M3MaterialOutlinedPasswordBoxStyle");
- Add("M3MaterialFilledPasswordBoxStyle", isImplicit: true);
- Add("M3MaterialElevatedButtonStyle");
- Add("M3MaterialFilledButtonStyle", isImplicit: true);
- Add("M3MaterialFilledTonalButtonStyle");
- Add("M3MaterialOutlinedButtonStyle");
- Add("M3MaterialTextButtonStyle");
- Add("M3MaterialIconButtonStyle");
- Add("M3MaterialCalendarViewStyle", isImplicit: true);
- Add("M3MaterialCalendarDatePickerStyle", isImplicit: true);
- Add("M3MaterialFlyoutPresenterStyle", isImplicit: true);
- Add("M3MaterialMenuFlyoutPresenterStyle", isImplicit: true);
- Add("M3MaterialNavigationViewStyle", isImplicit: true);
- Add("M3MaterialNavigationViewItemStyle", isImplicit: true);
- Add("M3MaterialListViewStyle", isImplicit: true);
- Add("M3MaterialListViewItemStyle", isImplicit: true);
- Add("M3MaterialTextToggleButtonStyle", isImplicit: true);
- Add("M3MaterialIconToggleButtonStyle");
- Add("M3MaterialDatePickerStyle", isImplicit: true);
- Add("M3MaterialComboBoxStyle", isImplicit: true);
- Add("M3MaterialFabStyle");
- Add("M3MaterialSurfaceFabStyle");
- Add("M3MaterialSecondaryFabStyle");
- Add("M3MaterialTertiaryFabStyle");
- Add("M3MaterialSmallFabStyle");
- Add("M3MaterialSurfaceSmallFabStyle");
- Add("M3MaterialSecondarySmallFabStyle");
- Add("M3MaterialTertiarySmallFabStyle");
- Add("M3MaterialLargeFabStyle");
- Add("M3MaterialSurfaceLargeFabStyle");
- Add("M3MaterialSecondaryLargeFabStyle");
- Add("M3MaterialTertiaryLargeFabStyle");
- Add("M3MaterialExtendedFabStyle");
- Add("M3MaterialSurfaceExtendedFabStyle");
- Add("M3MaterialSecondaryExtendedFabStyle");
- Add("M3MaterialTertiaryExtendedFabStyle");
- Add("M3MaterialSliderStyle");
- Add("M3MaterialToggleSwitchStyle", isImplicit: true);
- Add("M3MaterialHyperlinkButtonStyle", isImplicit: true);
- Add("M3MaterialSecondaryHyperlinkButtonStyle");
- Add("M3MaterialProgressRingStyle", isImplicit: true);
- Add("M3MaterialProgressBarStyle", isImplicit: true);
+ Add("MaterialAppBarButtonStyle", isImplicit: true);
+ Add("MaterialBodyLarge");
+ Add("MaterialBodyMedium", isImplicit: true);
+ Add("MaterialBodySmall");
+ Add("MaterialCalendarDatePickerStyle", isImplicit: true);
+ Add("MaterialCalendarViewStyle", isImplicit: true);
+ Add("MaterialCheckBoxStyle", isImplicit: true);
+ Add("MaterialComboBoxStyle", isImplicit: true);
+ Add("MaterialCommandBarStyle", isImplicit: true);
+ Add("MaterialDatePickerStyle", isImplicit: true);
+ Add("MaterialDisplayLarge");
+ Add("MaterialDisplayMedium");
+ Add("MaterialDisplaySmall");
+ Add("MaterialElevatedButtonStyle");
+ Add("MaterialExtendedFabStyle");
+ Add("MaterialFabStyle");
+ Add("MaterialFilledButtonStyle", isImplicit: true);
+ Add("MaterialFilledPasswordBoxStyle", isImplicit: true);
+ Add("MaterialFilledTextBoxStyle", isImplicit: true);
+ Add("MaterialFilledTonalButtonStyle");
+ Add("MaterialFlyoutPresenterStyle", isImplicit: true);
+ Add("MaterialHeadlineLarge");
+ Add("MaterialHeadlineMedium");
+ Add("MaterialHeadlineSmall");
+ Add("MaterialHyperlinkButtonStyle", isImplicit: true);
+ Add("MaterialIconButtonStyle");
+ Add("MaterialIconToggleButtonStyle");
+ Add("MaterialLabelLarge");
+ Add("MaterialLabelMedium");
+ Add("MaterialLabelSmall");
+ Add("MaterialLargeFabStyle");
+ Add("MaterialListViewItemStyle", isImplicit: true);
+ Add("MaterialListViewStyle", isImplicit: true);
+ Add("MaterialMenuFlyoutPresenterStyle", isImplicit: true);
+ Add("MaterialNavigationViewItemStyle", isImplicit: true);
+ Add("MaterialNavigationViewStyle", isImplicit: true);
+ Add("MaterialOutlinedButtonStyle");
+ Add("MaterialOutlinedPasswordBoxStyle");
+ Add("MaterialOutlinedTextBoxStyle");
+ Add("MaterialRadioButtonStyle", isImplicit: true);
+ Add("MaterialSecondaryCheckBoxStyle");
+ Add("MaterialSecondaryExtendedFabStyle");
+ Add("MaterialSecondaryFabStyle");
+ Add("MaterialSecondaryHyperlinkButtonStyle");
+ Add("MaterialSecondaryLargeFabStyle");
+ Add("MaterialSecondaryRadioButtonStyle");
+ Add("MaterialSecondarySmallFabStyle");
+ Add("MaterialSliderStyle", isImplicit: true);
+ Add("MaterialSmallFabStyle");
+ Add("MaterialSurfaceExtendedFabStyle");
+ Add("MaterialSurfaceFabStyle");
+ Add("MaterialSurfaceLargeFabStyle");
+ Add("MaterialSurfaceSmallFabStyle");
+ Add("MaterialTertiaryExtendedFabStyle");
+ Add("MaterialTertiaryFabStyle");
+ Add("MaterialTertiaryLargeFabStyle");
+ Add("MaterialTertiarySmallFabStyle");
+ Add("MaterialTextButtonStyle");
+ Add("MaterialTextToggleButtonStyle", isImplicit: true);
+ Add("MaterialTitleLarge");
+ Add("MaterialTitleMedium");
+ Add("MaterialTitleSmall");
+ Add("MaterialToggleSwitchStyle", isImplicit: true);
+
return result;
void Add(string key, string alias = null, bool isImplicit = false) =>
diff --git a/src/library/Uno.Material/Styles/Controls/v2/Button.xaml b/src/library/Uno.Material/Styles/Controls/v2/Button.xaml
index cdd190f56..7266a2c87 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/Button.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/Button.xaml
@@ -9,22 +9,22 @@
mc:Ignorable="d not_win">
-
- 40
- 48
- 16,0
- 12,0
- 20
+ 40
+ 48
+ 16,0
+ 12,0
+ 20
- 14
- 7.143
+ 14
+ 7.143
-
-
-
-
-
-
-
+ BasedOn="{StaticResource MaterialDefaultCalendarDatePickerStyle}" />
diff --git a/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml b/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
index dd2e3487e..5add1b6e2 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/CalendarView.xaml
@@ -6,15 +6,15 @@
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
mc:Ignorable="not_win">
- M0,0L32,0 16,19.745z
- M0,0L32,0 16,19.745z
+
-
-
-
-
-
+ BasedOn="{StaticResource DefaultMaterialCalendarViewStyle}" />
diff --git a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
index eeaa29706..46b0116a5 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/CheckBox.xaml
@@ -17,14 +17,14 @@
18
4
-
-
-
-
-
-
-
@@ -111,7 +111,7 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"
- Elevation="{StaticResource M3MaterialDatePickerFlyoutElevation}"
+ Elevation="{StaticResource MaterialDatePickerFlyoutElevation}"
ShadowColor="Black">
@@ -138,17 +138,17 @@
Grid.ColumnSpan="5"
Height="{ThemeResource DatePickerFlyoutPresenterHighlightHeight}"
VerticalAlignment="Center"
- Fill="{ThemeResource M3MaterialDatePickerFlyoutPresenterHighlightFill}" />
+ Fill="{ThemeResource MaterialDatePickerFlyoutPresenterHighlightFill}" />
+ Fill="{ThemeResource MaterialDatePickerFlyoutPresenterSpacerFill}" />
+ Fill="{ThemeResource MaterialDatePickerFlyoutPresenterSpacerFill}" />
+ Fill="{ThemeResource MaterialDatePickerFlyoutPresenterSpacerFill}" />
+ Style="{StaticResource MaterialTextButtonStyle}" />
+ Style="{StaticResource MaterialTextButtonStyle}" />
@@ -188,11 +188,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/library/Uno.Material/Styles/Controls/v2/Flyout.xaml b/src/library/Uno.Material/Styles/Controls/v2/Flyout.xaml
index 7500fffe1..eceba5ddb 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/Flyout.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/Flyout.xaml
@@ -7,22 +7,22 @@
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
mc:Ignorable="not_win ios android">
- M30.561941,0L31.997,1.393004 10.467954,23.597999 0,15.350999 1.2379759,13.780992 10.287961,20.909952z
- M0,0L25.194,16 0,32z
- 112
- 280
- 48
- 16
- 16
- 16
- 16
- 1
- 14
- 7.143
- 38
+ M30.561941,0L31.997,1.393004 10.467954,23.597999 0,15.350999 1.2379759,13.780992 10.287961,20.909952z
+ M0,0L25.194,16 0,32z
+ 112
+ 280
+ 48
+ 16
+ 16
+ 16
+ 16
+ 1
+ 14
+ 7.143
+ 38
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-