wip

unoplatform · Oct 11, 2023 · be3e716 · be3e716
1 parent 9f0bf51
commit be3e716
Show file tree

Hide file tree

Showing 14 changed files with 227 additions and 221 deletions.
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/Button.cs
@@ -81,14 +81,14 @@ public static partial class StateLayerBackground
 					[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevation")]
 					public static ThemeResourceKey<double> Elevation => new("ElevatedButtonElevation");
 
+					[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")]
+					public static ThemeResourceKey<double> ElevationDisabled => new("ElevatedButtonElevationDisabled");
+
 					[ResourceKeyDefinition(typeof(Brush), "ElevatedButtonForeground")]
 					public static ThemeResourceKey<Brush> Foreground => new("ElevatedButtonForeground");
 
 					[ResourceKeyDefinition(typeof(bool), "ElevatedButtonIsTintEnabled")]
 					public static StaticResourceKey<bool> IsTintEnabled => new("ElevatedButtonIsTintEnabled");
-
-					[ResourceKeyDefinition(typeof(double), "ElevatedButtonElevationDisabled")]
-					public static ThemeResourceKey<double> ElevationDisabled => new("ElevatedButtonElevationDisabled");
 				}
 				public static partial class Filled
 				{
@@ -146,12 +146,12 @@ public static partial class StateLayerBackground
 						[ResourceKeyDefinition(typeof(Brush), "FilledButtonStateLayerBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FilledButtonStateLayerBackgroundPressed");
 					}
-					[ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("FilledButtonForeground");
-
 					[ResourceKeyDefinition(typeof(double), "ButtonElevation")]
 					public static ThemeResourceKey<double> Elevation => new("ButtonElevation");
 
+					[ResourceKeyDefinition(typeof(Brush), "FilledButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("FilledButtonForeground");
+
 					[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
 				}
@@ -211,12 +211,12 @@ public static partial class StateLayerBackground
 						[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonStateLayerBackgroundPressed")]
 						public static ThemeResourceKey<Brush> Pressed => new("FilledTonalButtonStateLayerBackgroundPressed");
 					}
-					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("FilledTonalButtonForeground");
-
 					[ResourceKeyDefinition(typeof(double), "ButtonElevation")]
 					public static ThemeResourceKey<double> Elevation => new("ButtonElevation");
 
+					[ResourceKeyDefinition(typeof(Brush), "FilledTonalButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("FilledTonalButtonForeground");
+
 					[ResourceKeyDefinition(typeof(Thickness), "ButtonMargin")]
 					public static ThemeResourceKey<Thickness> Margin => new("ButtonMargin");
 				}
@@ -238,9 +238,6 @@ public static partial class OpacityHiddenState
 						[ResourceKeyDefinition(typeof(double), "IconButtonOpacityVisibleState")]
 						public static ThemeResourceKey<double> PointerOver => new("IconButtonOpacityVisibleState");
 					}
-					[ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")]
-					public static ThemeResourceKey<Brush> Foreground => new("IconButtonForeground");
-
 					[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillFocused")]
 					public static ThemeResourceKey<Brush> EllipseFillFocused => new("IconButtonEllipseFillFocused");
 
@@ -250,6 +247,9 @@ public static partial class OpacityHiddenState
 					[ResourceKeyDefinition(typeof(Brush), "IconButtonEllipseFillPressed")]
 					public static ThemeResourceKey<Brush> EllipseFillPressed => new("IconButtonEllipseFillPressed");
 
+					[ResourceKeyDefinition(typeof(Brush), "IconButtonForeground")]
+					public static ThemeResourceKey<Brush> Foreground => new("IconButtonForeground");
+
 					[ResourceKeyDefinition(typeof(Brush), "IconButtonForegroundDisabled")]
 					public static ThemeResourceKey<Brush> ForegroundDisabled => new("IconButtonForegroundDisabled");
 				}

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CalendarDatePicker.cs
@@ -64,32 +64,32 @@ public static partial class TextForeground
 					[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerTextForegroundSelected")]
 					public static ThemeResourceKey<Brush> Selected => new("CalendarDatePickerTextForegroundSelected");
 				}
-				[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerBorderThemeThickness")]
-				public static ThemeResourceKey<Thickness> BorderThemeThickness => new("CalendarDatePickerBorderThemeThickness");
-
-				[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> CornerRadius => new("CalendarDatePickerCornerRadius");
-
-				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")]
-				public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerForeground");
-
-				[ResourceKeyDefinition(typeof(double), "CalendarDatePickerHeight")]
-				public static ThemeResourceKey<double> Height => new("CalendarDatePickerHeight");
-
-				[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerContentMargin")]
-				public static ThemeResourceKey<Thickness> ContentMargin => new("CalendarDatePickerContentMargin");
-
 				[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerBackgroundCornerRadius")]
 				public static ThemeResourceKey<CornerRadius> BackgroundCornerRadius => new("CalendarDatePickerBackgroundCornerRadius");
 
 				[ResourceKeyDefinition(typeof(double), "CalendarDatePickerBackgroundMinHeight")]
 				public static ThemeResourceKey<double> BackgroundMinHeight => new("CalendarDatePickerBackgroundMinHeight");
 
+				[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerBorderThemeThickness")]
+				public static ThemeResourceKey<Thickness> BorderThemeThickness => new("CalendarDatePickerBorderThemeThickness");
+
 				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerBottomBorderBrush")]
 				public static ThemeResourceKey<Brush> BottomBorderBrush => new("CalendarDatePickerBottomBorderBrush");
 
 				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerCalendarGlyphForegroundDisabled")]
 				public static ThemeResourceKey<Brush> CalendarGlyphForegroundDisabled => new("CalendarDatePickerCalendarGlyphForegroundDisabled");
+
+				[ResourceKeyDefinition(typeof(Thickness), "CalendarDatePickerContentMargin")]
+				public static ThemeResourceKey<Thickness> ContentMargin => new("CalendarDatePickerContentMargin");
+
+				[ResourceKeyDefinition(typeof(CornerRadius), "CalendarDatePickerCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("CalendarDatePickerCornerRadius");
+
+				[ResourceKeyDefinition(typeof(Brush), "CalendarDatePickerForeground")]
+				public static ThemeResourceKey<Brush> Foreground => new("CalendarDatePickerForeground");
+
+				[ResourceKeyDefinition(typeof(double), "CalendarDatePickerHeight")]
+				public static ThemeResourceKey<double> Height => new("CalendarDatePickerHeight");
 			}
 			public static partial class Styles
 			{

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/CheckBox.cs
@@ -155,12 +155,24 @@ public static partial class StateCircleOpacityPointerOver
 				[ResourceKeyDefinition(typeof(int), "CheckBoxCharacterSpacing")]
 				public static ThemeResourceKey<int> CharacterSpacing => new("CheckBoxCharacterSpacing");
 
+				[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaBorderThickness")]
+				public static ThemeResourceKey<Thickness> CheckAreaBorderThickness => new("CheckBoxCheckAreaBorderThickness");
+
 				[ResourceKeyDefinition(typeof(CornerRadius), "CheckBoxCheckAreaCornerRadius")]
 				public static ThemeResourceKey<CornerRadius> CheckAreaCornerRadius => new("CheckBoxCheckAreaCornerRadius");
 
 				[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaPadding")]
 				public static ThemeResourceKey<Thickness> CheckAreaPadding => new("CheckBoxCheckAreaPadding");
 
+				[ResourceKeyDefinition(typeof(double), "CheckBoxCheckAreaSize")]
+				public static ThemeResourceKey<double> CheckAreaSize => new("CheckBoxCheckAreaSize");
+
+				[ResourceKeyDefinition(typeof(string), "CheckBoxCheckGlyphPathData")]
+				public static ThemeResourceKey<string> CheckGlyphPathData => new("CheckBoxCheckGlyphPathData");
+
+				[ResourceKeyDefinition(typeof(double), "CheckBoxFocusAreaSize")]
+				public static ThemeResourceKey<double> FocusAreaSize => new("CheckBoxFocusAreaSize");
+
 				[ResourceKeyDefinition(typeof(FontFamily), "CheckBoxFontFamily")]
 				public static ThemeResourceKey<FontFamily> FontFamily => new("CheckBoxFontFamily");
 
@@ -173,23 +185,11 @@ public static partial class StateCircleOpacityPointerOver
 				[ResourceKeyDefinition(typeof(Brush), "CheckBoxForegroundUnchecked")]
 				public static ThemeResourceKey<Brush> ForegroundUnchecked => new("CheckBoxForegroundUnchecked");
 
-				[ResourceKeyDefinition(typeof(double), "CheckBoxFocusAreaSize")]
-				public static ThemeResourceKey<double> FocusAreaSize => new("CheckBoxFocusAreaSize");
-
-				[ResourceKeyDefinition(typeof(double), "CheckBoxCheckAreaSize")]
-				public static ThemeResourceKey<double> CheckAreaSize => new("CheckBoxCheckAreaSize");
+				[ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")]
+				public static ThemeResourceKey<string> HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData");
 
 				[ResourceKeyDefinition(typeof(double), "CheckBoxStateCircleOpacityFocused")]
 				public static ThemeResourceKey<double> StateCircleOpacityFocused => new("CheckBoxStateCircleOpacityFocused");
-
-				[ResourceKeyDefinition(typeof(Thickness), "CheckBoxCheckAreaBorderThickness")]
-				public static ThemeResourceKey<Thickness> CheckAreaBorderThickness => new("CheckBoxCheckAreaBorderThickness");
-
-				[ResourceKeyDefinition(typeof(string), "CheckBoxCheckGlyphPathData")]
-				public static ThemeResourceKey<string> CheckGlyphPathData => new("CheckBoxCheckGlyphPathData");
-
-				[ResourceKeyDefinition(typeof(string), "CheckBoxHyphenGlyphPathData")]
-				public static ThemeResourceKey<string> HyphenGlyphPathData => new("CheckBoxHyphenGlyphPathData");
 			}
 			public static partial class Styles
 			{

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ComboBox.cs
@@ -202,21 +202,21 @@ public static partial class UpperPlaceHolderForeground
 					[ResourceKeyDefinition(typeof(Brush), "ComboBoxUpperPlaceHolderForegroundPressed")]
 					public static ThemeResourceKey<Brush> Pressed => new("ComboBoxUpperPlaceHolderForegroundPressed");
 				}
+				[ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("ComboBoxCornerRadius");
+
+				[ResourceKeyDefinition(typeof(string), "ComboBoxDownArrowPathData")]
+				public static StaticResourceKey<string> DownArrowPathData => new("ComboBoxDownArrowPathData");
+
+
 				[ResourceKeyDefinition(typeof(double), "ComboBoxMinHeight")]
 				public static ThemeResourceKey<double> MinHeight => new("ComboBoxMinHeight");
 
 				[ResourceKeyDefinition(typeof(Thickness), "ComboBoxPadding")]
 				public static ThemeResourceKey<Thickness> Padding => new("ComboBoxPadding");
 
-
-				[ResourceKeyDefinition(typeof(string), "ComboBoxDownArrowPathData")]
-				public static StaticResourceKey<string> DownArrowPathData => new("ComboBoxDownArrowPathData");
-
 				[ResourceKeyDefinition(typeof(string), "ComboBoxUpArrowPathData")]
 				public static StaticResourceKey<string> UpArrowPathData => new("ComboBoxUpArrowPathData");
-
-				[ResourceKeyDefinition(typeof(CornerRadius), "ComboBoxCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> CornerRadius => new("ComboBoxCornerRadius");
 			}
 			public static partial class Styles
 			{

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/ContentDialog.cs
@@ -14,35 +14,23 @@ public static partial class ContentDialog
 		{
 			public static partial class Resources
 			{
-
 				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogBackground")]
 				public static StaticResourceKey<Brush> Background => new("MaterialContentDialogBackground");
 
+
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogCommandSpaceToContentMargin")]
+				public static StaticResourceKey<Thickness> CommandSpaceToContentMargin => new("MaterialContentDialogCommandSpaceToContentMargin");
+
 				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogContentForeground")]
 				public static StaticResourceKey<Brush> ContentForeground => new("MaterialContentDialogContentForeground");
 
 				[ResourceKeyDefinition(typeof(CornerRadius), "MaterialContentDialogCornerRadius")]
 				public static StaticResourceKey<CornerRadius> CornerRadius => new("MaterialContentDialogCornerRadius");
 
-				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogCommandSpaceToContentMargin")]
-				public static StaticResourceKey<Thickness> CommandSpaceToContentMargin => new("MaterialContentDialogCommandSpaceToContentMargin");
-
 
 				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogEdgeMargin")]
 				public static StaticResourceKey<Thickness> EdgeMargin => new("MaterialContentDialogEdgeMargin");
 
-				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogPanelPadding")]
-				public static StaticResourceKey<Thickness> PanelPadding => new("MaterialContentDialogPanelPadding");
-
-				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogSmokeLayerBackground")]
-				public static StaticResourceKey<Brush> SmokeLayerBackground => new("MaterialContentDialogSmokeLayerBackground");
-
-				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogTitleForeground")]
-				public static StaticResourceKey<Brush> TitleForeground => new("MaterialContentDialogTitleForeground");
-
-				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogTitleToContentMargin")]
-				public static StaticResourceKey<Thickness> TitleToContentMargin => new("MaterialContentDialogTitleToContentMargin");
-
 				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMaxHeight")]
 				public static StaticResourceKey<double> MaxHeight => new("MaterialContentDialogMaxHeight");
 
@@ -54,6 +42,18 @@ public static partial class Resources
 
 				[ResourceKeyDefinition(typeof(double), "MaterialContentDialogMinWidth")]
 				public static StaticResourceKey<double> MinWidth => new("MaterialContentDialogMinWidth");
+
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogPanelPadding")]
+				public static StaticResourceKey<Thickness> PanelPadding => new("MaterialContentDialogPanelPadding");
+
+				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogSmokeLayerBackground")]
+				public static StaticResourceKey<Brush> SmokeLayerBackground => new("MaterialContentDialogSmokeLayerBackground");
+
+				[ResourceKeyDefinition(typeof(Brush), "MaterialContentDialogTitleForeground")]
+				public static StaticResourceKey<Brush> TitleForeground => new("MaterialContentDialogTitleForeground");
+
+				[ResourceKeyDefinition(typeof(Thickness), "MaterialContentDialogTitleToContentMargin")]
+				public static StaticResourceKey<Thickness> TitleToContentMargin => new("MaterialContentDialogTitleToContentMargin");
 			}
 			public static partial class Styles
 			{

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/DatePicker.cs
@@ -78,25 +78,25 @@ public static partial class ButtonDateTextForeground
 				[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonBackground")]
 				public static ThemeResourceKey<Brush> ButtonBackground => new("DatePickerButtonBackground");
 
-				[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")]
-				public static ThemeResourceKey<Brush> ButtonForeground => new("DatePickerButtonForeground");
-
-				[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerCornerRadius")]
-				public static ThemeResourceKey<CornerRadius> CornerRadius => new("DatePickerCornerRadius");
-
-				[ResourceKeyDefinition(typeof(double), "DatePickerHeight")]
-				public static ThemeResourceKey<double> Height => new("DatePickerHeight");
-
-
 				[ResourceKeyDefinition(typeof(double), "DatePickerButtonBottomBorderHeight")]
 				public static ThemeResourceKey<double> ButtonBottomBorderHeight => new("DatePickerButtonBottomBorderHeight");
 
+				[ResourceKeyDefinition(typeof(Brush), "DatePickerButtonForeground")]
+				public static ThemeResourceKey<Brush> ButtonForeground => new("DatePickerButtonForeground");
+
 				[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonHeaderMargin")]
 				public static ThemeResourceKey<Thickness> ButtonHeaderMargin => new("DatePickerButtonHeaderMargin");
 
 				[ResourceKeyDefinition(typeof(Thickness), "DatePickerButtonPlaceholderMargin")]
 				public static ThemeResourceKey<Thickness> ButtonPlaceholderMargin => new("DatePickerButtonPlaceholderMargin");
 
+				[ResourceKeyDefinition(typeof(CornerRadius), "DatePickerCornerRadius")]
+				public static ThemeResourceKey<CornerRadius> CornerRadius => new("DatePickerCornerRadius");
+
+
+				[ResourceKeyDefinition(typeof(double), "DatePickerHeight")]
+				public static ThemeResourceKey<double> Height => new("DatePickerHeight");
+
 				[ResourceKeyDefinition(typeof(Brush), "DatePickerPlaceholderTextForeground")]
 				public static ThemeResourceKey<Brush> PlaceholderTextForeground => new("DatePickerPlaceholderTextForeground");
 			}

diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs b/src/library/Uno.Themes.WinUI.Markup/Theme/FloatingActionButton.cs
@@ -64,11 +64,11 @@ public static partial class StateOverlayBackground
 					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
 					public static ThemeResourceKey<CornerRadius> CornerRadius => new("MaterialFabCornerRadius");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
-					public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
-
 					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
 					public static ThemeResourceKey<double> IconTextPadding => new("MaterialFabIconTextPadding");
+
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+					public static ThemeResourceKey<Thickness> Padding => new("MaterialFabPadding");
 				}
 				public static partial class LargeFab
 				{
@@ -131,11 +131,11 @@ public static partial class StateOverlayBackground
 					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
 					public static ThemeResourceKey<CornerRadius> FabCornerRadius => new("MaterialFabCornerRadius");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
-					public static ThemeResourceKey<Thickness> FabPadding => new("MaterialFabPadding");
-
 					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
 					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+					public static ThemeResourceKey<Thickness> FabPadding => new("MaterialFabPadding");
 				}
 				public static partial class SecondaryLargeFab
 				{
@@ -220,11 +220,11 @@ public static partial class StateOverlayBackground
 					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
 					public static ThemeResourceKey<CornerRadius> FabCornerRadius => new("MaterialFabCornerRadius");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
-					public static ThemeResourceKey<Thickness> FabPadding => new("MaterialFabPadding");
-
 					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
 					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+					public static ThemeResourceKey<Thickness> FabPadding => new("MaterialFabPadding");
 				}
 				public static partial class SurfaceLargeFab
 				{
@@ -298,11 +298,11 @@ public static partial class StateOverlayBackground
 					[ResourceKeyDefinition(typeof(CornerRadius), "MaterialFabCornerRadius")]
 					public static ThemeResourceKey<CornerRadius> FabCornerRadius => new("MaterialFabCornerRadius");
 
-					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
-					public static ThemeResourceKey<Thickness> FabPadding => new("MaterialFabPadding");
-
 					[ResourceKeyDefinition(typeof(double), "MaterialFabIconTextPadding")]
 					public static ThemeResourceKey<double> FabIconTextPadding => new("MaterialFabIconTextPadding");
+
+					[ResourceKeyDefinition(typeof(Thickness), "MaterialFabPadding")]
+					public static ThemeResourceKey<Thickness> FabPadding => new("MaterialFabPadding");
 				}
 				public static partial class TertiaryLargeFab
 				{