diff --git a/doc/material-controls-styles.md b/doc/material-controls-styles.md
index 402ed6b5a..cd4c449ca 100644
--- a/doc/material-controls-styles.md
+++ b/doc/material-controls-styles.md
@@ -64,8 +64,8 @@ TextBlock|BodySmall|
TextBlock|CaptionLarge|
TextBlock|CaptionMedium|
TextBlock|CaptionSmall|
-TextBox|FilledTextBoxStyle|True
-TextBox|OutlinedTextBoxStyle|
+TextBox|FilledTextBoxStyle|
+TextBox|OutlinedTextBoxStyle|True
ToggleButton|TextToggleButtonStyle|True
ToggleButton|IconToggleButtonStyle|
ToggleSwitch|ToggleSwitchStyle|True
diff --git a/doc/styles/TextBox.md b/doc/styles/TextBox.md
index e1a920271..fc24e36fd 100644
--- a/doc/styles/TextBox.md
+++ b/doc/styles/TextBox.md
@@ -3,8 +3,8 @@
Style Key|IsDefaultStyle*
-|-
-FilledTextBoxStyle|True
-OutlinedTextBoxStyle|
+FilledTextBoxStyle|
+OutlinedTextBoxStyle|True
IsDefaultStyle*: Styles in this column will be set as the default implicit style for the matching control
diff --git a/src/library/Uno.Cupertino/Uno.Cupertino.csproj b/src/library/Uno.Cupertino/Uno.Cupertino.csproj
index 6e8ea3274..f38866575 100644
--- a/src/library/Uno.Cupertino/Uno.Cupertino.csproj
+++ b/src/library/Uno.Cupertino/Uno.Cupertino.csproj
@@ -55,7 +55,7 @@
-
+
diff --git a/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj b/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
index 53d4a4914..0507deb9e 100644
--- a/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
+++ b/src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
@@ -1,4 +1,4 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ 0,12
+
+
+
+
+
+
+
+
+
+ 5
+ 0,12
+ 40
+ 0
+
+
+
+
+
+
+
+
+
+ 0,12
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
index 0edf29c25..88071b895 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/ProgressBar.xaml
@@ -9,12 +9,14 @@
+
250
4
+
250
4
diff --git a/src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml b/src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml
index f7c9f9d0f..e1d9dc2f5 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/_Resources.xaml
@@ -22,6 +22,7 @@
+
@@ -58,6 +59,7 @@
+
diff --git a/src/library/Uno.Material/Uno.Material.csproj b/src/library/Uno.Material/Uno.Material.csproj
index 10242f17b..b6e437962 100644
--- a/src/library/Uno.Material/Uno.Material.csproj
+++ b/src/library/Uno.Material/Uno.Material.csproj
@@ -60,7 +60,7 @@
-
+
diff --git a/src/library/Uno.Themes.WinUI.Markup/ResourceValue.cs b/src/library/Uno.Themes.WinUI.Markup/ResourceValue.cs
deleted file mode 100644
index cedcdc9f4..000000000
--- a/src/library/Uno.Themes.WinUI.Markup/ResourceValue.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using Microsoft.UI.Xaml;
-using Uno.Extensions.Markup;
-
-
-namespace Uno.Themes.Markup
-{
- public struct ResourceValue
- {
- public ResourceValue(string key, bool isThemeResource = false)
- {
- Key = key;
- IsThemeResource = isThemeResource;
- }
-
- public string Key { get; }
-
- public bool IsThemeResource { get; }
-
- public static implicit operator Action>(ResourceValue resource) =>
- resource.IsThemeResource ?
- ThemeResource.Get(resource.Key)
- : StaticResource.Get(resource.Key);
- }
-}
diff --git a/src/library/Uno.Themes.WinUI.Markup/Theme.Brushes.cs b/src/library/Uno.Themes.WinUI.Markup/Theme.Brushes.cs
index 6529be6fc..1e2614e39 100644
--- a/src/library/Uno.Themes.WinUI.Markup/Theme.Brushes.cs
+++ b/src/library/Uno.Themes.WinUI.Markup/Theme.Brushes.cs
@@ -1,4 +1,5 @@
using Microsoft.UI.Xaml.Media;
+using Uno.Extensions.Markup;
using Uno.Extensions.Markup.Internals;
namespace Uno.Themes.Markup
@@ -10,1022 +11,1022 @@ public static class Brushes
public static class Primary
{
[ResourceKeyDefinition(typeof(Brush), "PrimaryBrush")]
- public static ResourceValue Default => new("PrimaryBrush", true);
+ public static ThemeResourceKey Default => new("PrimaryBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryHoverBrush")]
- public static ResourceValue Hover => new("PrimaryHoverBrush", true);
+ public static ThemeResourceKey Hover => new("PrimaryHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryFocusedBrush")]
- public static ResourceValue Focused => new("PrimaryFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("PrimaryFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryPressedBrush")]
- public static ResourceValue Pressed => new("PrimaryPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("PrimaryPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryDraggedBrush")]
- public static ResourceValue Dragged => new("PrimaryDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("PrimaryDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimarySelectedBrush")]
- public static ResourceValue Selected => new("PrimarySelectedBrush", true);
+ public static ThemeResourceKey Selected => new("PrimarySelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryMediumBrush")]
- public static ResourceValue Medium => new("PrimaryMediumBrush", true);
+ public static ThemeResourceKey Medium => new("PrimaryMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryLowBrush")]
- public static ResourceValue Low => new("PrimaryLowBrush", true);
+ public static ThemeResourceKey Low => new("PrimaryLowBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryDisabledBrush")]
- public static ResourceValue Disabled => new("PrimaryDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("PrimaryDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("PrimaryDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("PrimaryDisabledLowBrush");
public static class Inverse
{
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseBrush")]
- public static ResourceValue Default => new("PrimaryInverseBrush", true);
+ public static ThemeResourceKey Default => new("PrimaryInverseBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseHoverBrush")]
- public static ResourceValue Hover => new("PrimaryInverseHoverBrush", true);
+ public static ThemeResourceKey Hover => new("PrimaryInverseHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseFocusedBrush")]
- public static ResourceValue Focused => new("PrimaryInverseFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("PrimaryInverseFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInversePressedBrush")]
- public static ResourceValue Pressed => new("PrimaryInversePressedBrush", true);
+ public static ThemeResourceKey Pressed => new("PrimaryInversePressedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseDraggedBrush")]
- public static ResourceValue Dragged => new("PrimaryInverseDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("PrimaryInverseDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseSelectedBrush")]
- public static ResourceValue Selected => new("PrimaryInverseSelectedBrush", true);
+ public static ThemeResourceKey Selected => new("PrimaryInverseSelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseMediumBrush")]
- public static ResourceValue Medium => new("PrimaryInverseMediumBrush", true);
+ public static ThemeResourceKey Medium => new("PrimaryInverseMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseLowBrush")]
- public static ResourceValue Low => new("PrimaryInverseLowBrush", true);
+ public static ThemeResourceKey Low => new("PrimaryInverseLowBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseDisabledBrush")]
- public static ResourceValue Disabled => new("PrimaryInverseDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("PrimaryInverseDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryInverseDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("PrimaryInverseDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("PrimaryInverseDisabledLowBrush");
}
public static class Container
{
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerBrush")]
- public static ResourceValue Default => new("PrimaryContainerBrush", true);
+ public static ThemeResourceKey Default => new("PrimaryContainerBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerHoverBrush")]
- public static ResourceValue Hover => new("PrimaryContainerHoverBrush", true);
+ public static ThemeResourceKey Hover => new("PrimaryContainerHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerFocusedBrush")]
- public static ResourceValue Focused => new("PrimaryContainerFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("PrimaryContainerFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerPressedBrush")]
- public static ResourceValue Pressed => new("PrimaryContainerPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("PrimaryContainerPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerDraggedBrush")]
- public static ResourceValue Dragged => new("PrimaryContainerDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("PrimaryContainerDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerSelectedBrush")]
- public static ResourceValue Selected => new("PrimaryContainerSelectedBrush", true);
+ public static ThemeResourceKey Selected => new("PrimaryContainerSelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerMediumBrush")]
- public static ResourceValue Medium => new("PrimaryContainerMediumBrush", true);
+ public static ThemeResourceKey Medium => new("PrimaryContainerMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerLowBrush")]
- public static ResourceValue Low => new("PrimaryContainerLowBrush", true);
+ public static ThemeResourceKey Low => new("PrimaryContainerLowBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerDisabledBrush")]
- public static ResourceValue Disabled => new("PrimaryContainerDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("PrimaryContainerDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryContainerDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("PrimaryContainerDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("PrimaryContainerDisabledLowBrush");
}
public static class VariantLight
{
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightBrush")]
- public static ResourceValue Default => new("PrimaryVariantLightBrush", true);
+ public static ThemeResourceKey Default => new("PrimaryVariantLightBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightHoverBrush")]
- public static ResourceValue Hover => new("PrimaryVariantLightHoverBrush", true);
+ public static ThemeResourceKey Hover => new("PrimaryVariantLightHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightFocusedBrush")]
- public static ResourceValue Focused => new("PrimaryVariantLightFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("PrimaryVariantLightFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightPressedBrush")]
- public static ResourceValue Pressed => new("PrimaryVariantLightPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("PrimaryVariantLightPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightDraggedBrush")]
- public static ResourceValue Dragged => new("PrimaryVariantLightDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("PrimaryVariantLightDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightSelectedBrush")]
- public static ResourceValue Selected => new("PrimaryVariantLightSelectedBrush", true);
+ public static ThemeResourceKey Selected => new("PrimaryVariantLightSelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightMediumBrush")]
- public static ResourceValue Medium => new("PrimaryVariantLightMediumBrush", true);
+ public static ThemeResourceKey Medium => new("PrimaryVariantLightMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightLowBrush")]
- public static ResourceValue Low => new("PrimaryVariantLightLowBrush", true);
+ public static ThemeResourceKey Low => new("PrimaryVariantLightLowBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightDisabledBrush")]
- public static ResourceValue Disabled => new("PrimaryVariantLightDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("PrimaryVariantLightDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantLightDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("PrimaryVariantLightDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("PrimaryVariantLightDisabledLowBrush");
}
public static class VariantDark
{
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkBrush")]
- public static ResourceValue Default => new("PrimaryVariantDarkBrush", true);
+ public static ThemeResourceKey Default => new("PrimaryVariantDarkBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkHoverBrush")]
- public static ResourceValue Hover => new("PrimaryVariantDarkHoverBrush", true);
+ public static ThemeResourceKey Hover => new("PrimaryVariantDarkHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkFocusedBrush")]
- public static ResourceValue Focused => new("PrimaryVariantDarkFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("PrimaryVariantDarkFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkPressedBrush")]
- public static ResourceValue Pressed => new("PrimaryVariantDarkPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("PrimaryVariantDarkPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkDraggedBrush")]
- public static ResourceValue Dragged => new("PrimaryVariantDarkDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("PrimaryVariantDarkDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkSelectedBrush")]
- public static ResourceValue Selected => new("PrimaryVariantDarkSelectedBrush", true);
+ public static ThemeResourceKey Selected => new("PrimaryVariantDarkSelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkMediumBrush")]
- public static ResourceValue Medium => new("PrimaryVariantDarkMediumBrush", true);
+ public static ThemeResourceKey Medium => new("PrimaryVariantDarkMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkLowBrush")]
- public static ResourceValue Low => new("PrimaryVariantDarkLowBrush", true);
+ public static ThemeResourceKey Low => new("PrimaryVariantDarkLowBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkDisabledBrush")]
- public static ResourceValue Disabled => new("PrimaryVariantDarkDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("PrimaryVariantDarkDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "PrimaryVariantDarkDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("PrimaryVariantDarkDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("PrimaryVariantDarkDisabledLowBrush");
}
}
public static class OnPrimary
{
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryBrush")]
- public static ResourceValue Default => new("OnPrimaryBrush", true);
+ public static ThemeResourceKey Default => new("OnPrimaryBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryHoverBrush")]
- public static ResourceValue Hover => new("OnPrimaryHoverBrush", true);
+ public static ThemeResourceKey Hover => new("OnPrimaryHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryFocusedBrush")]
- public static ResourceValue Focused => new("OnPrimaryFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("OnPrimaryFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryPressedBrush")]
- public static ResourceValue Pressed => new("OnPrimaryPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("OnPrimaryPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryDraggedBrush")]
- public static ResourceValue Dragged => new("OnPrimaryDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("OnPrimaryDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimarySelectedBrush")]
- public static ResourceValue Selected => new("OnPrimarySelectedBrush", true);
+ public static ThemeResourceKey Selected => new("OnPrimarySelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryMediumBrush")]
- public static ResourceValue Medium => new("OnPrimaryMediumBrush", true);
+ public static ThemeResourceKey Medium => new("OnPrimaryMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryLowBrush")]
- public static ResourceValue Low => new("OnPrimaryLowBrush", true);
+ public static ThemeResourceKey Low => new("OnPrimaryLowBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryDisabledBrush")]
- public static ResourceValue Disabled => new("OnPrimaryDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("OnPrimaryDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("OnPrimaryDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("OnPrimaryDisabledLowBrush");
public static class Container
{
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerBrush")]
- public static ResourceValue Default => new("OnPrimaryContainerBrush", true);
+ public static ThemeResourceKey Default => new("OnPrimaryContainerBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerHoverBrush")]
- public static ResourceValue Hover => new("OnPrimaryContainerHoverBrush", true);
+ public static ThemeResourceKey Hover => new("OnPrimaryContainerHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerFocusedBrush")]
- public static ResourceValue Focused => new("OnPrimaryContainerFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("OnPrimaryContainerFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerPressedBrush")]
- public static ResourceValue Pressed => new("OnPrimaryContainerPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("OnPrimaryContainerPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerDraggedBrush")]
- public static ResourceValue Dragged => new("OnPrimaryContainerDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("OnPrimaryContainerDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerSelectedBrush")]
- public static ResourceValue Selected => new("OnPrimaryContainerSelectedBrush", true);
+ public static ThemeResourceKey Selected => new("OnPrimaryContainerSelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerMediumBrush")]
- public static ResourceValue Medium => new("OnPrimaryContainerMediumBrush", true);
+ public static ThemeResourceKey Medium => new("OnPrimaryContainerMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerLowBrush")]
- public static ResourceValue Low => new("OnPrimaryContainerLowBrush", true);
+ public static ThemeResourceKey Low => new("OnPrimaryContainerLowBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerDisabledBrush")]
- public static ResourceValue Disabled => new("OnPrimaryContainerDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("OnPrimaryContainerDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "OnPrimaryContainerDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("OnPrimaryContainerDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("OnPrimaryContainerDisabledLowBrush");
}
}
public static class Secondary
{
[ResourceKeyDefinition(typeof(Brush), "SecondaryBrush")]
- public static ResourceValue Default => new("SecondaryBrush", true);
+ public static ThemeResourceKey Default => new("SecondaryBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryHoverBrush")]
- public static ResourceValue Hover => new("SecondaryHoverBrush", true);
+ public static ThemeResourceKey Hover => new("SecondaryHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryFocusedBrush")]
- public static ResourceValue Focused => new("SecondaryFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("SecondaryFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryPressedBrush")]
- public static ResourceValue Pressed => new("SecondaryPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("SecondaryPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryDraggedBrush")]
- public static ResourceValue Dragged => new("SecondaryDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("SecondaryDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondarySelectedBrush")]
- public static ResourceValue Selected => new("SecondarySelectedBrush", true);
+ public static ThemeResourceKey Selected => new("SecondarySelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryMediumBrush")]
- public static ResourceValue Medium => new("SecondaryMediumBrush", true);
+ public static ThemeResourceKey Medium => new("SecondaryMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryLowBrush")]
- public static ResourceValue Low => new("SecondaryLowBrush", true);
+ public static ThemeResourceKey Low => new("SecondaryLowBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryDisabledBrush")]
- public static ResourceValue Disabled => new("SecondaryDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("SecondaryDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("SecondaryDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("SecondaryDisabledLowBrush");
public static class Container
{
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerBrush")]
- public static ResourceValue Default => new("SecondaryContainerBrush", true);
+ public static ThemeResourceKey Default => new("SecondaryContainerBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerHoverBrush")]
- public static ResourceValue Hover => new("SecondaryContainerHoverBrush", true);
+ public static ThemeResourceKey Hover => new("SecondaryContainerHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerFocusedBrush")]
- public static ResourceValue Focused => new("SecondaryContainerFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("SecondaryContainerFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerPressedBrush")]
- public static ResourceValue Pressed => new("SecondaryContainerPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("SecondaryContainerPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerDraggedBrush")]
- public static ResourceValue Dragged => new("SecondaryContainerDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("SecondaryContainerDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerSelectedBrush")]
- public static ResourceValue Selected => new("SecondaryContainerSelectedBrush", true);
+ public static ThemeResourceKey Selected => new("SecondaryContainerSelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerMediumBrush")]
- public static ResourceValue Medium => new("SecondaryContainerMediumBrush", true);
+ public static ThemeResourceKey Medium => new("SecondaryContainerMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerLowBrush")]
- public static ResourceValue Low => new("SecondaryContainerLowBrush", true);
+ public static ThemeResourceKey Low => new("SecondaryContainerLowBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerDisabledBrush")]
- public static ResourceValue Disabled => new("SecondaryContainerDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("SecondaryContainerDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryContainerDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("SecondaryContainerDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("SecondaryContainerDisabledLowBrush");
}
public static class VariantLight
{
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightBrush")]
- public static ResourceValue Default => new("SecondaryVariantLightBrush", true);
+ public static ThemeResourceKey Default => new("SecondaryVariantLightBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightHoverBrush")]
- public static ResourceValue Hover => new("SecondaryVariantLightHoverBrush", true);
+ public static ThemeResourceKey Hover => new("SecondaryVariantLightHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightFocusedBrush")]
- public static ResourceValue Focused => new("SecondaryVariantLightFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("SecondaryVariantLightFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightPressedBrush")]
- public static ResourceValue Pressed => new("SecondaryVariantLightPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("SecondaryVariantLightPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightDraggedBrush")]
- public static ResourceValue Dragged => new("SecondaryVariantLightDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("SecondaryVariantLightDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightSelectedBrush")]
- public static ResourceValue Selected => new("SecondaryVariantLightSelectedBrush", true);
+ public static ThemeResourceKey Selected => new("SecondaryVariantLightSelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightMediumBrush")]
- public static ResourceValue Medium => new("SecondaryVariantLightMediumBrush", true);
+ public static ThemeResourceKey Medium => new("SecondaryVariantLightMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightLowBrush")]
- public static ResourceValue Low => new("SecondaryVariantLightLowBrush", true);
+ public static ThemeResourceKey Low => new("SecondaryVariantLightLowBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightDisabledBrush")]
- public static ResourceValue Disabled => new("SecondaryVariantLightDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("SecondaryVariantLightDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantLightDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("SecondaryVariantLightDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("SecondaryVariantLightDisabledLowBrush");
}
public static class VariantDark
{
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkBrush")]
- public static ResourceValue Default => new("SecondaryVariantDarkBrush", true);
+ public static ThemeResourceKey Default => new("SecondaryVariantDarkBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkHoverBrush")]
- public static ResourceValue Hover => new("SecondaryVariantDarkHoverBrush", true);
+ public static ThemeResourceKey Hover => new("SecondaryVariantDarkHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkFocusedBrush")]
- public static ResourceValue Focused => new("SecondaryVariantDarkFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("SecondaryVariantDarkFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkPressedBrush")]
- public static ResourceValue Pressed => new("SecondaryVariantDarkPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("SecondaryVariantDarkPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkDraggedBrush")]
- public static ResourceValue Dragged => new("SecondaryVariantDarkDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("SecondaryVariantDarkDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkSelectedBrush")]
- public static ResourceValue Selected => new("SecondaryVariantDarkSelectedBrush", true);
+ public static ThemeResourceKey Selected => new("SecondaryVariantDarkSelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkMediumBrush")]
- public static ResourceValue Medium => new("SecondaryVariantDarkMediumBrush", true);
+ public static ThemeResourceKey Medium => new("SecondaryVariantDarkMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkLowBrush")]
- public static ResourceValue Low => new("SecondaryVariantDarkLowBrush", true);
+ public static ThemeResourceKey Low => new("SecondaryVariantDarkLowBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkDisabledBrush")]
- public static ResourceValue Disabled => new("SecondaryVariantDarkDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("SecondaryVariantDarkDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "SecondaryVariantDarkDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("SecondaryVariantDarkDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("SecondaryVariantDarkDisabledLowBrush");
}
}
public static class OnSecondary
{
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryBrush")]
- public static ResourceValue Default => new("OnSecondaryBrush", true);
+ public static ThemeResourceKey Default => new("OnSecondaryBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryHoverBrush")]
- public static ResourceValue Hover => new("OnSecondaryHoverBrush", true);
+ public static ThemeResourceKey Hover => new("OnSecondaryHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryFocusedBrush")]
- public static ResourceValue Focused => new("OnSecondaryFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("OnSecondaryFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryPressedBrush")]
- public static ResourceValue Pressed => new("OnSecondaryPressedBrush", true);
+ public static ThemeResourceKey Pressed => new("OnSecondaryPressedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryDraggedBrush")]
- public static ResourceValue Dragged => new("OnSecondaryDraggedBrush", true);
+ public static ThemeResourceKey Dragged => new("OnSecondaryDraggedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondarySelectedBrush")]
- public static ResourceValue Selected => new("OnSecondarySelectedBrush", true);
+ public static ThemeResourceKey Selected => new("OnSecondarySelectedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryMediumBrush")]
- public static ResourceValue Medium => new("OnSecondaryMediumBrush", true);
+ public static ThemeResourceKey Medium => new("OnSecondaryMediumBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryLowBrush")]
- public static ResourceValue Low => new("OnSecondaryLowBrush", true);
+ public static ThemeResourceKey Low => new("OnSecondaryLowBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryDisabledBrush")]
- public static ResourceValue Disabled => new("OnSecondaryDisabledBrush", true);
+ public static ThemeResourceKey Disabled => new("OnSecondaryDisabledBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryDisabledLowBrush")]
- public static ResourceValue DisabledLow => new("OnSecondaryDisabledLowBrush", true);
+ public static ThemeResourceKey DisabledLow => new("OnSecondaryDisabledLowBrush");
public static class Container
{
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryContainerBrush")]
- public static ResourceValue Default => new("OnSecondaryContainerBrush", true);
+ public static ThemeResourceKey Default => new("OnSecondaryContainerBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryContainerHoverBrush")]
- public static ResourceValue Hover => new("OnSecondaryContainerHoverBrush", true);
+ public static ThemeResourceKey Hover => new("OnSecondaryContainerHoverBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryContainerFocusedBrush")]
- public static ResourceValue Focused => new("OnSecondaryContainerFocusedBrush", true);
+ public static ThemeResourceKey Focused => new("OnSecondaryContainerFocusedBrush");
[ResourceKeyDefinition(typeof(Brush), "OnSecondaryContainerPressedBrush")]
- public static ResourceValue