From ec26e143a273747e510f8ee13d82d10e237d6afa Mon Sep 17 00:00:00 2001
From: AndresAldana <andres.aldana@horus.com.uy>
Date: Thu, 22 Dec 2022 13:29:25 -0500
Subject: [PATCH 1/5] feat: Add common theme constants library

---
 src/Directory.Packages.props                  |   2 +-
 src/Uno.Toolkit.sln                           | 115 ++++++++++
 .../AssemblyInfo.cs                           |   5 +
 .../Theme.Styles.cs                           | 208 ++++++++++++++++++
 .../Uno.Toolkit.WinUI.Themes.Markup.csproj    |  37 ++++
 5 files changed, 366 insertions(+), 1 deletion(-)
 create mode 100644 src/library/Uno.Toolkit.WinUI.Themes.Markup/AssemblyInfo.cs
 create mode 100644 src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
 create mode 100644 src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 78d092ba9..bb5a70aac 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -9,7 +9,7 @@
     <PackageVersion Include="Uno.Cupertino" Version="2.4.1" />
     <PackageVersion Include="Uno.Cupertino.WinUI" Version="2.4.1" />
     <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="1.0.0-dev.125" />
-    <PackageVersion Include="Uno.WinUI.Markup" Version="4.6.0-dev.12" />
+    <PackageVersion Include="Uno.WinUI.Markup" Version="4.6.0-dev.14" />
     <PackageVersion Include="Uno.Material" Version="2.4.1" />
     <PackageVersion Include="Uno.Material.WinUI" Version="2.4.1" />
     <PackageVersion Include="Uno.UI" Version="4.6.19" />
diff --git a/src/Uno.Toolkit.sln b/src/Uno.Toolkit.sln
index 45857f96e..07c6f9957 100644
--- a/src/Uno.Toolkit.sln
+++ b/src/Uno.Toolkit.sln
@@ -90,6 +90,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{5D8F2DC4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markup", "Markup", "{558EEC70-D98E-491B-9652-F1376168004C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Toolkit.WinUI.Themes.Markup", "library\Uno.Toolkit.WinUI.Themes.Markup\Uno.Toolkit.WinUI.Themes.Markup.csproj", "{93E7BA9F-E1DE-48C6-8185-454942B6C034}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Android = Ad-Hoc|Android
@@ -2798,6 +2800,118 @@ Global
 		{83C3F373-8CAA-4127-9E7E-6474D9E9BCD4}.Release|WASM.ActiveCfg = Release|Any CPU
 		{83C3F373-8CAA-4127-9E7E-6474D9E9BCD4}.Release|x64.ActiveCfg = Release|Any CPU
 		{83C3F373-8CAA-4127-9E7E-6474D9E9BCD4}.Release|x86.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Android.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Android.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|macOS.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|macOS.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Packages.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Packages.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Packages_WinUI.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Packages_WinUI.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Samples.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Samples.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Samples_WinUI.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|Samples_WinUI.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|WASM.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|WASM.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Android.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Android.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|ARM64.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|macOS.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|macOS.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Packages.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Packages.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Packages_WinUI.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Packages_WinUI.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Samples.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Samples.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Samples_WinUI.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|Samples_WinUI.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|WASM.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|WASM.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|x64.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.AppStore|x86.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Android.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Android.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|ARM.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|macOS.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|macOS.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Packages.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Packages.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Packages_WinUI.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Packages_WinUI.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Samples.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Samples.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Samples_WinUI.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|Samples_WinUI.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|WASM.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|WASM.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|x64.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Debug|x86.Build.0 = Debug|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Android.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Android.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|ARM.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|ARM.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|ARM64.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|iPhone.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|macOS.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|macOS.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Packages.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Packages.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Packages_WinUI.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Packages_WinUI.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Samples.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Samples.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Samples_WinUI.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|Samples_WinUI.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|WASM.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|WASM.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|x64.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|x64.Build.0 = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|x86.ActiveCfg = Release|Any CPU
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2826,6 +2940,7 @@ Global
 		{04A5011F-DC76-4BD6-9994-FC1C9E937A6D} = {39BDC5B9-2807-409B-A8CB-B41B33E05C5D}
 		{83C3F373-8CAA-4127-9E7E-6474D9E9BCD4} = {558EEC70-D98E-491B-9652-F1376168004C}
 		{558EEC70-D98E-491B-9652-F1376168004C} = {39BDC5B9-2807-409B-A8CB-B41B33E05C5D}
+		{93E7BA9F-E1DE-48C6-8185-454942B6C034} = {558EEC70-D98E-491B-9652-F1376168004C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EEF2F9D4-91C2-4F1A-BF0C-654FD02D3E2A}
diff --git a/src/library/Uno.Toolkit.WinUI.Themes.Markup/AssemblyInfo.cs b/src/library/Uno.Toolkit.WinUI.Themes.Markup/AssemblyInfo.cs
new file mode 100644
index 000000000..d457aa619
--- /dev/null
+++ b/src/library/Uno.Toolkit.WinUI.Themes.Markup/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+using System.Reflection;
+using Microsoft.UI.Xaml.MarkupHelpers.Internals;
+
+[assembly: AssemblyMetadata("IsTrimmable", "True")]
+[assembly: ResourceDefinitionClass(typeof(Uno.Toolkit.Themes.Markup.Theme))]
diff --git a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
new file mode 100644
index 000000000..6fa938701
--- /dev/null
+++ b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
@@ -0,0 +1,208 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.MarkupHelpers;
+using Microsoft.UI.Xaml.MarkupHelpers.Internals;
+
+namespace Uno.Toolkit.Themes.Markup
+{
+	public static partial class Theme
+	{
+		public static class Styles
+		{
+			public static class AppBarButton
+			{
+				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
+				public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("MainCommandStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
+				public static Action<IDependencyPropertyBuilder<Style>> Modal => StaticResource.Get<Style>("ModalMainCommandStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
+				public static Action<IDependencyPropertyBuilder<Style>> Primary => StaticResource.Get<Style>("PrimaryMainCommandStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
+				public static Action<IDependencyPropertyBuilder<Style>> PrimaryModal => StaticResource.Get<Style>("PrimaryModalMainCommandStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
+				public static Action<IDependencyPropertyBuilder<Style>> PrimaryAppBar => StaticResource.Get<Style>("PrimaryAppBarButtonStyle");
+			}
+
+			public static class Card
+			{
+				[ResourceKeyDefinition(typeof(Style), "FilledCardStyle", TargetType = typeof(Card))]
+				public static Action<IDependencyPropertyBuilder<Style>> Filled => StaticResource.Get<Style>("FilledCardStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "OutlinedCardStyle", TargetType = typeof(Card))]
+				public static Action<IDependencyPropertyBuilder<Style>> Outlined => StaticResource.Get<Style>("OutlinedCardStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "ElevatedCardStyle", TargetType = typeof(Card))]
+				public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedCardStyle");
+
+				public static class Avatar
+				{
+					[ResourceKeyDefinition(typeof(Style), "AvatarFilledCardStyle", TargetType = typeof(Card))]
+					public static Action<IDependencyPropertyBuilder<Style>> Filled => StaticResource.Get<Style>("AvatarFilledCardStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "AvatarOutlinedCardStyle", TargetType = typeof(Card))]
+					public static Action<IDependencyPropertyBuilder<Style>> Outlined => StaticResource.Get<Style>("AvatarOutlinedCardStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "AvatarElevatedCardStyle", TargetType = typeof(Card))]
+					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("AvatarElevatedCardStyle");
+				}
+
+				public static class SmallMedia
+				{
+					[ResourceKeyDefinition(typeof(Style), "SmallMediaFilledCardStyle", TargetType = typeof(Card))]
+					public static Action<IDependencyPropertyBuilder<Style>> Filled => StaticResource.Get<Style>("SmallMediaFilledCardStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "SmallMediaOutlinedCardStyle", TargetType = typeof(Card))]
+					public static Action<IDependencyPropertyBuilder<Style>> Outlined => StaticResource.Get<Style>("SmallMediaOutlinedCardStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "SmallMediaElevatedCardStyle", TargetType = typeof(Card))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("SmallMediaElevatedCardStyle");
+				}
+			}
+
+			public static class CardContentControl
+			{
+				[ResourceKeyDefinition(typeof(Style), "FilledCardContentControlStyle", TargetType = typeof(CardContentControl))]
+				public static Action<IDependencyPropertyBuilder<Style>> Filled => StaticResource.Get<Style>("FilledCardContentControlStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "OutlinedCardContentControlStyle", TargetType = typeof(CardContentControl))]
+				public static Action<IDependencyPropertyBuilder<Style>> Outlined => StaticResource.Get<Style>("OutlinedCardContentControlStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "ElevatedCardContentControlStyle", TargetType = typeof(CardContentControl))]
+				public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedCardContentControlStyle");
+			}
+
+			public static class Chip
+			{
+				public static class Assist
+				{
+					[ResourceKeyDefinition(typeof(Style), "AssistChipStyle", TargetType = typeof(Chip))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("AssistChipStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "ElevatedAssistChipStyle", TargetType = typeof(Chip))]
+					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedAssistChipStyle");
+				}
+
+				public static class Input
+				{
+					[ResourceKeyDefinition(typeof(Style), "InputChipStyle", TargetType = typeof(Chip))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("InputChipStyle");
+				}
+
+				public static class Filter
+				{
+					[ResourceKeyDefinition(typeof(Style), "FilterChipStyle", TargetType = typeof(Chip))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("FilterChipStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "ElevatedFilterChipStyle", TargetType = typeof(Chip))]
+					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedFilterChipStyle");
+				}
+
+				public static class Suggestion
+				{
+					[ResourceKeyDefinition(typeof(Style), "SuggestionChipStyle", TargetType = typeof(Chip))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("SuggestionChipStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "ElevatedSuggestionChipStyle", TargetType = typeof(Chip))]
+					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedSuggestionChipStyle");
+				}
+			}
+
+			public static class ChipGroup
+			{
+				public static class Assist
+				{
+					[ResourceKeyDefinition(typeof(Style), "AssistChipGroupStyle", TargetType = typeof(ChipGroup))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("AssistChipGroupStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "ElevatedAssistChipGroupStyle", TargetType = typeof(ChipGroup))]
+					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedAssistChipGroupStyle");
+				}
+
+				public static class Input
+				{
+					[ResourceKeyDefinition(typeof(Style), "InputChipGroupStyle", TargetType = typeof(ChipGroup))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("InputChipGroupStyle");
+				}
+
+				public static class Filter
+				{
+					[ResourceKeyDefinition(typeof(Style), "FilterChipGroupStyle", TargetType = typeof(ChipGroup))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("FilterChipGroupStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "ElevatedFilterChipGroupStyle", TargetType = typeof(ChipGroup))]
+					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedFilterChipGroupStyle");
+				}
+
+				public static class Suggestion
+				{
+					[ResourceKeyDefinition(typeof(Style), "SuggestionChipGroupStyle", TargetType = typeof(ChipGroup))]
+					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("SuggestionChipGroupStyle");
+
+					[ResourceKeyDefinition(typeof(Style), "ElevatedSuggestionChipGroupStyle", TargetType = typeof(ChipGroup))]
+					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedSuggestionChipGroupStyle");
+				}
+			}
+
+			public static class Divider
+			{
+				[ResourceKeyDefinition(typeof(Style), "DividerStyle", TargetType = typeof(Divider))]
+				public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("DividerStyle");
+			}
+
+			public static class FlyoutPresenter
+			{
+				[ResourceKeyDefinition(typeof(Style), "LeftDrawerFlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
+				public static Action<IDependencyPropertyBuilder<Style>> LeftDrawer => StaticResource.Get<Style>("LeftDrawerFlyoutPresenterStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "TopDrawerFlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
+				public static Action<IDependencyPropertyBuilder<Style>> TopDrawer => StaticResource.Get<Style>("TopDrawerFlyoutPresenterStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "RightDrawerFlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
+				public static Action<IDependencyPropertyBuilder<Style>> RightDrawer => StaticResource.Get<Style>("RightDrawerFlyoutPresenterStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "BottomDrawerFlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
+				public static Action<IDependencyPropertyBuilder<Style>> BottomDrawer => StaticResource.Get<Style>("BottomDrawerFlyoutPresenterStyle");
+			}
+
+			public static class NavigationBar
+			{
+				[ResourceKeyDefinition(typeof(Style), "NavigationBarStyle", TargetType = typeof(NavigationBar))]
+				public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("NavigationBarStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "ModalNavigationBarStyle", TargetType = typeof(NavigationBar))]
+				public static Action<IDependencyPropertyBuilder<Style>> Modal => StaticResource.Get<Style>("ModalNavigationBarStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "PrimaryNavigationBarStyle", TargetType = typeof(NavigationBar))]
+				public static Action<IDependencyPropertyBuilder<Style>> Primary => StaticResource.Get<Style>("PrimaryNavigationBarStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "PrimaryModalNavigationBarStyle", TargetType = typeof(NavigationBar))]
+				public static Action<IDependencyPropertyBuilder<Style>> PrimaryModal => StaticResource.Get<Style>("PrimaryModalNavigationBarStyle");
+			}
+
+			public static class TabBar
+			{
+				[ResourceKeyDefinition(typeof(Style), "BottomTabBarStyle", TargetType = typeof(TabBar))]
+				public static Action<IDependencyPropertyBuilder<Style>> Bottom => StaticResource.Get<Style>("BottomTabBarStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "TopTabBarStyle", TargetType = typeof(TabBar))]
+				public static Action<IDependencyPropertyBuilder<Style>> Top => StaticResource.Get<Style>("TopTabBarStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "ColoredTopTabBarStyle", TargetType = typeof(TabBar))]
+				public static Action<IDependencyPropertyBuilder<Style>> Colored => StaticResource.Get<Style>("ColoredTopTabBarStyle");
+			}
+
+			public static class TabBarItem
+			{
+				[ResourceKeyDefinition(typeof(Style), "BottomFabTabBarItemStyle", TargetType = typeof(TabBarItem))]
+				public static Action<IDependencyPropertyBuilder<Style>> BottomFab => StaticResource.Get<Style>("BottomFabTabBarItemStyle");
+
+				[ResourceKeyDefinition(typeof(Style), "BottomTabBarItemStyle", TargetType = typeof(TabBarItem))]
+				public static Action<IDependencyPropertyBuilder<Style>> Bottom => StaticResource.Get<Style>("BottomTabBarItemStyle");
+			}
+		}
+	}
+}
diff --git a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj
new file mode 100644
index 000000000..cc039c973
--- /dev/null
+++ b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="MSBuild.Sdk.Extras/3.0.38">
+
+	<!--
+	Adding project references to this project requires some manual adjustments.
+	Please see https://github.com/unoplatform/uno/issues/3909 for more details.
+	-->
+	<PropertyGroup>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'!=''">$(TargetFrameworkOverride)</TargetFrameworks>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'==''">netstandard2.0</TargetFrameworks>
+		<TargetFrameworks Condition="'$(TargetFrameworkOverride)'=='' and '$(DisableNet6MobileTargets)'!='true'">$(TargetFrameworks);net5.0-windows10.0.18362;net6.0-ios;net6.0-macos;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
+		<AllowedOutputExtensionsInPackageBuildOutputFolder>.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
+		<GenerateLibraryLayout>true</GenerateLibraryLayout>
+		<DefineConstants>WINUI</DefineConstants>
+		<UseWinUI>true</UseWinUI>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All"/>
+		<PackageReference Include="Uno.WinUI.Markup" />
+	</ItemGroup>
+
+	<ItemGroup Condition="$(_IsWinUI)">
+		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
+		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\Uno.Toolkit.UI\Uno.Toolkit.WinUI.csproj" />
+	</ItemGroup>
+
+	<PropertyGroup>
+		<PackageDescription>A set of C# for Markup helpers for Uno.Toolkit.WinUI</PackageDescription>
+	</PropertyGroup>
+
+	<Import Project="..\..\winappsdk-workaround.targets" />
+</Project>

From ef2db90e3560bfb99729ccad3c6e7fa2c08ebce3 Mon Sep 17 00:00:00 2001
From: AndresAldana <andres.aldana@horus.com.uy>
Date: Fri, 23 Dec 2022 11:23:07 -0500
Subject: [PATCH 2/5] chore: update csproj and add new packages to
 ResourceValue definition

---
 src/Directory.Packages.props                   |  3 ++-
 .../Uno.Toolkit.WinUI.Themes.Markup.csproj     | 18 ++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index bb5a70aac..492f52aaf 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -9,6 +9,7 @@
     <PackageVersion Include="Uno.Cupertino" Version="2.4.1" />
     <PackageVersion Include="Uno.Cupertino.WinUI" Version="2.4.1" />
     <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="1.0.0-dev.125" />
+    <PackageVersion Include="Uno.Themes.WinUI.Markup" Version="2.5.0-dev.1" />
     <PackageVersion Include="Uno.WinUI.Markup" Version="4.6.0-dev.14" />
     <PackageVersion Include="Uno.Material" Version="2.4.1" />
     <PackageVersion Include="Uno.Material.WinUI" Version="2.4.1" />
@@ -30,4 +31,4 @@
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.4.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22518.1" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj
index cc039c973..72afac941 100644
--- a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj
+++ b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj
@@ -12,25 +12,15 @@
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
 		<DefineConstants>WINUI</DefineConstants>
-		<UseWinUI>true</UseWinUI>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All"/>
-		<PackageReference Include="Uno.WinUI.Markup" />
-	</ItemGroup>
-
-	<ItemGroup Condition="$(_IsWinUI)">
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.25" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.25" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\Uno.Toolkit.UI\Uno.Toolkit.WinUI.csproj" />
+	<ItemGroup Condition="$(TargetFramework.Contains('-windows10'))">
+		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
+		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
 	</ItemGroup>
 
 	<PropertyGroup>
-		<PackageDescription>A set of C# for Markup helpers for Uno.Toolkit.WinUI</PackageDescription>
+		<PackageDescription>A base set of C# for Markup helpers that can be shared between all compatible Themes from Uno.Themes for Uno.Toolkit.WinUI</PackageDescription>
 	</PropertyGroup>
 
 	<Import Project="..\..\winappsdk-workaround.targets" />

From d21e2142088bfe02943f3b3967667cd5fb11e344 Mon Sep 17 00:00:00 2001
From: AndresAldana <andres.aldana@horus.com.uy>
Date: Fri, 23 Dec 2022 13:37:46 -0500
Subject: [PATCH 3/5] chore: add packages

---
 .../Uno.Toolkit.WinUI.Themes.Markup.csproj                   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj
index 72afac941..951d469fa 100644
--- a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj
+++ b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Uno.Toolkit.WinUI.Themes.Markup.csproj
@@ -19,6 +19,11 @@
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Include="Uno.Themes.WinUI.Markup" />
+	  <PackageReference Include="Uno.WinUI.Markup" />
+	</ItemGroup>
+
 	<PropertyGroup>
 		<PackageDescription>A base set of C# for Markup helpers that can be shared between all compatible Themes from Uno.Themes for Uno.Toolkit.WinUI</PackageDescription>
 	</PropertyGroup>

From 2fd48162355418eb0273084460e9287664406c10 Mon Sep 17 00:00:00 2001
From: AndresAldana <andres.aldana@horus.com.uy>
Date: Mon, 26 Dec 2022 12:21:34 -0500
Subject: [PATCH 4/5] chore: use ResourceValue for Theme.Styles

---
 src/Directory.Packages.props                  |  2 +-
 .../Theme.Styles.cs                           | 95 +++++++++----------
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 492f52aaf..66f036e7e 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -9,7 +9,7 @@
     <PackageVersion Include="Uno.Cupertino" Version="2.4.1" />
     <PackageVersion Include="Uno.Cupertino.WinUI" Version="2.4.1" />
     <PackageVersion Include="Uno.Extensions.Markup.Generators" Version="1.0.0-dev.125" />
-    <PackageVersion Include="Uno.Themes.WinUI.Markup" Version="2.5.0-dev.1" />
+    <PackageVersion Include="Uno.Themes.WinUI.Markup" Version="2.5.0-dev.3" />
     <PackageVersion Include="Uno.WinUI.Markup" Version="4.6.0-dev.14" />
     <PackageVersion Include="Uno.Material" Version="2.4.1" />
     <PackageVersion Include="Uno.Material.WinUI" Version="2.4.1" />
diff --git a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
index 6fa938701..6c9b61b60 100644
--- a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
+++ b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
@@ -1,7 +1,6 @@
-using System;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.MarkupHelpers;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.MarkupHelpers.Internals;
+using Uno.Themes.Markup;
 
 namespace Uno.Toolkit.Themes.Markup
 {
@@ -12,67 +11,67 @@ public static class Styles
 			public static class AppBarButton
 			{
 				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
-				public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("MainCommandStyle");
+				public static ResourceValue<Style> Default => new("MainCommandStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
-				public static Action<IDependencyPropertyBuilder<Style>> Modal => StaticResource.Get<Style>("ModalMainCommandStyle");
+				public static ResourceValue<Style> Modal => new("ModalMainCommandStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
-				public static Action<IDependencyPropertyBuilder<Style>> Primary => StaticResource.Get<Style>("PrimaryMainCommandStyle");
+				public static ResourceValue<Style> Primary => new("PrimaryMainCommandStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
-				public static Action<IDependencyPropertyBuilder<Style>> PrimaryModal => StaticResource.Get<Style>("PrimaryModalMainCommandStyle");
+				public static ResourceValue<Style> PrimaryModal => new("PrimaryModalMainCommandStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
-				public static Action<IDependencyPropertyBuilder<Style>> PrimaryAppBar => StaticResource.Get<Style>("PrimaryAppBarButtonStyle");
+				public static ResourceValue<Style> PrimaryAppBar => new("PrimaryAppBarButtonStyle");
 			}
 
 			public static class Card
 			{
 				[ResourceKeyDefinition(typeof(Style), "FilledCardStyle", TargetType = typeof(Card))]
-				public static Action<IDependencyPropertyBuilder<Style>> Filled => StaticResource.Get<Style>("FilledCardStyle");
+				public static ResourceValue<Style> Filled => new("FilledCardStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "OutlinedCardStyle", TargetType = typeof(Card))]
-				public static Action<IDependencyPropertyBuilder<Style>> Outlined => StaticResource.Get<Style>("OutlinedCardStyle");
+				public static ResourceValue<Style> Outlined => new("OutlinedCardStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "ElevatedCardStyle", TargetType = typeof(Card))]
-				public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedCardStyle");
+				public static ResourceValue<Style> Elevated => new("ElevatedCardStyle");
 
 				public static class Avatar
 				{
 					[ResourceKeyDefinition(typeof(Style), "AvatarFilledCardStyle", TargetType = typeof(Card))]
-					public static Action<IDependencyPropertyBuilder<Style>> Filled => StaticResource.Get<Style>("AvatarFilledCardStyle");
+					public static ResourceValue<Style> Filled => new("AvatarFilledCardStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "AvatarOutlinedCardStyle", TargetType = typeof(Card))]
-					public static Action<IDependencyPropertyBuilder<Style>> Outlined => StaticResource.Get<Style>("AvatarOutlinedCardStyle");
+					public static ResourceValue<Style> Outlined => new("AvatarOutlinedCardStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "AvatarElevatedCardStyle", TargetType = typeof(Card))]
-					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("AvatarElevatedCardStyle");
+					public static ResourceValue<Style> Elevated => new("AvatarElevatedCardStyle");
 				}
 
 				public static class SmallMedia
 				{
 					[ResourceKeyDefinition(typeof(Style), "SmallMediaFilledCardStyle", TargetType = typeof(Card))]
-					public static Action<IDependencyPropertyBuilder<Style>> Filled => StaticResource.Get<Style>("SmallMediaFilledCardStyle");
+					public static ResourceValue<Style> Filled => new("SmallMediaFilledCardStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "SmallMediaOutlinedCardStyle", TargetType = typeof(Card))]
-					public static Action<IDependencyPropertyBuilder<Style>> Outlined => StaticResource.Get<Style>("SmallMediaOutlinedCardStyle");
+					public static ResourceValue<Style> Outlined => new("SmallMediaOutlinedCardStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "SmallMediaElevatedCardStyle", TargetType = typeof(Card))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("SmallMediaElevatedCardStyle");
+					public static ResourceValue<Style> Elevated => new("SmallMediaElevatedCardStyle");
 				}
 			}
 
 			public static class CardContentControl
 			{
 				[ResourceKeyDefinition(typeof(Style), "FilledCardContentControlStyle", TargetType = typeof(CardContentControl))]
-				public static Action<IDependencyPropertyBuilder<Style>> Filled => StaticResource.Get<Style>("FilledCardContentControlStyle");
+				public static ResourceValue<Style> Filled => new("FilledCardContentControlStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "OutlinedCardContentControlStyle", TargetType = typeof(CardContentControl))]
-				public static Action<IDependencyPropertyBuilder<Style>> Outlined => StaticResource.Get<Style>("OutlinedCardContentControlStyle");
+				public static ResourceValue<Style> Outlined => new("OutlinedCardContentControlStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "ElevatedCardContentControlStyle", TargetType = typeof(CardContentControl))]
-				public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedCardContentControlStyle");
+				public static ResourceValue<Style> Elevated => new("ElevatedCardContentControlStyle");
 			}
 
 			public static class Chip
@@ -80,34 +79,34 @@ public static class Chip
 				public static class Assist
 				{
 					[ResourceKeyDefinition(typeof(Style), "AssistChipStyle", TargetType = typeof(Chip))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("AssistChipStyle");
+					public static ResourceValue<Style> Default => new("AssistChipStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "ElevatedAssistChipStyle", TargetType = typeof(Chip))]
-					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedAssistChipStyle");
+					public static ResourceValue<Style> Elevated => new("ElevatedAssistChipStyle");
 				}
 
 				public static class Input
 				{
 					[ResourceKeyDefinition(typeof(Style), "InputChipStyle", TargetType = typeof(Chip))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("InputChipStyle");
+					public static ResourceValue<Style> Default => new("InputChipStyle");
 				}
 
 				public static class Filter
 				{
 					[ResourceKeyDefinition(typeof(Style), "FilterChipStyle", TargetType = typeof(Chip))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("FilterChipStyle");
+					public static ResourceValue<Style> Default => new("FilterChipStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "ElevatedFilterChipStyle", TargetType = typeof(Chip))]
-					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedFilterChipStyle");
+					public static ResourceValue<Style> Elevated => new("ElevatedFilterChipStyle");
 				}
 
 				public static class Suggestion
 				{
 					[ResourceKeyDefinition(typeof(Style), "SuggestionChipStyle", TargetType = typeof(Chip))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("SuggestionChipStyle");
+					public static ResourceValue<Style> Default => new("SuggestionChipStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "ElevatedSuggestionChipStyle", TargetType = typeof(Chip))]
-					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedSuggestionChipStyle");
+					public static ResourceValue<Style> Elevated => new("ElevatedSuggestionChipStyle");
 				}
 			}
 
@@ -116,92 +115,92 @@ public static class ChipGroup
 				public static class Assist
 				{
 					[ResourceKeyDefinition(typeof(Style), "AssistChipGroupStyle", TargetType = typeof(ChipGroup))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("AssistChipGroupStyle");
+					public static ResourceValue<Style> Default => new("AssistChipGroupStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "ElevatedAssistChipGroupStyle", TargetType = typeof(ChipGroup))]
-					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedAssistChipGroupStyle");
+					public static ResourceValue<Style> Elevated => new("ElevatedAssistChipGroupStyle");
 				}
 
 				public static class Input
 				{
 					[ResourceKeyDefinition(typeof(Style), "InputChipGroupStyle", TargetType = typeof(ChipGroup))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("InputChipGroupStyle");
+					public static ResourceValue<Style> Default => new("InputChipGroupStyle");
 				}
 
 				public static class Filter
 				{
 					[ResourceKeyDefinition(typeof(Style), "FilterChipGroupStyle", TargetType = typeof(ChipGroup))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("FilterChipGroupStyle");
+					public static ResourceValue<Style> Default => new("FilterChipGroupStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "ElevatedFilterChipGroupStyle", TargetType = typeof(ChipGroup))]
-					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedFilterChipGroupStyle");
+					public static ResourceValue<Style> Elevated => new("ElevatedFilterChipGroupStyle");
 				}
 
 				public static class Suggestion
 				{
 					[ResourceKeyDefinition(typeof(Style), "SuggestionChipGroupStyle", TargetType = typeof(ChipGroup))]
-					public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("SuggestionChipGroupStyle");
+					public static ResourceValue<Style> Default => new("SuggestionChipGroupStyle");
 
 					[ResourceKeyDefinition(typeof(Style), "ElevatedSuggestionChipGroupStyle", TargetType = typeof(ChipGroup))]
-					public static Action<IDependencyPropertyBuilder<Style>> Elevated => StaticResource.Get<Style>("ElevatedSuggestionChipGroupStyle");
+					public static ResourceValue<Style> Elevated => new("ElevatedSuggestionChipGroupStyle");
 				}
 			}
 
 			public static class Divider
 			{
 				[ResourceKeyDefinition(typeof(Style), "DividerStyle", TargetType = typeof(Divider))]
-				public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("DividerStyle");
+				public static ResourceValue<Style> Default => new("DividerStyle");
 			}
 
 			public static class FlyoutPresenter
 			{
 				[ResourceKeyDefinition(typeof(Style), "LeftDrawerFlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
-				public static Action<IDependencyPropertyBuilder<Style>> LeftDrawer => StaticResource.Get<Style>("LeftDrawerFlyoutPresenterStyle");
+				public static ResourceValue<Style> LeftDrawer => new("LeftDrawerFlyoutPresenterStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "TopDrawerFlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
-				public static Action<IDependencyPropertyBuilder<Style>> TopDrawer => StaticResource.Get<Style>("TopDrawerFlyoutPresenterStyle");
+				public static ResourceValue<Style> TopDrawer => new("TopDrawerFlyoutPresenterStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "RightDrawerFlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
-				public static Action<IDependencyPropertyBuilder<Style>> RightDrawer => StaticResource.Get<Style>("RightDrawerFlyoutPresenterStyle");
+				public static ResourceValue<Style> RightDrawer => new("RightDrawerFlyoutPresenterStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "BottomDrawerFlyoutPresenterStyle", TargetType = typeof(FlyoutPresenter))]
-				public static Action<IDependencyPropertyBuilder<Style>> BottomDrawer => StaticResource.Get<Style>("BottomDrawerFlyoutPresenterStyle");
+				public static ResourceValue<Style> BottomDrawer => new("BottomDrawerFlyoutPresenterStyle");
 			}
 
 			public static class NavigationBar
 			{
 				[ResourceKeyDefinition(typeof(Style), "NavigationBarStyle", TargetType = typeof(NavigationBar))]
-				public static Action<IDependencyPropertyBuilder<Style>> Default => StaticResource.Get<Style>("NavigationBarStyle");
+				public static ResourceValue<Style> Default => new("NavigationBarStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "ModalNavigationBarStyle", TargetType = typeof(NavigationBar))]
-				public static Action<IDependencyPropertyBuilder<Style>> Modal => StaticResource.Get<Style>("ModalNavigationBarStyle");
+				public static ResourceValue<Style> Modal => new("ModalNavigationBarStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "PrimaryNavigationBarStyle", TargetType = typeof(NavigationBar))]
-				public static Action<IDependencyPropertyBuilder<Style>> Primary => StaticResource.Get<Style>("PrimaryNavigationBarStyle");
+				public static ResourceValue<Style> Primary => new("PrimaryNavigationBarStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "PrimaryModalNavigationBarStyle", TargetType = typeof(NavigationBar))]
-				public static Action<IDependencyPropertyBuilder<Style>> PrimaryModal => StaticResource.Get<Style>("PrimaryModalNavigationBarStyle");
+				public static ResourceValue<Style> PrimaryModal => new("PrimaryModalNavigationBarStyle");
 			}
 
 			public static class TabBar
 			{
 				[ResourceKeyDefinition(typeof(Style), "BottomTabBarStyle", TargetType = typeof(TabBar))]
-				public static Action<IDependencyPropertyBuilder<Style>> Bottom => StaticResource.Get<Style>("BottomTabBarStyle");
+				public static ResourceValue<Style> Bottom => new("BottomTabBarStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "TopTabBarStyle", TargetType = typeof(TabBar))]
-				public static Action<IDependencyPropertyBuilder<Style>> Top => StaticResource.Get<Style>("TopTabBarStyle");
+				public static ResourceValue<Style> Top => new("TopTabBarStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "ColoredTopTabBarStyle", TargetType = typeof(TabBar))]
-				public static Action<IDependencyPropertyBuilder<Style>> Colored => StaticResource.Get<Style>("ColoredTopTabBarStyle");
+				public static ResourceValue<Style> Colored => new("ColoredTopTabBarStyle");
 			}
 
 			public static class TabBarItem
 			{
 				[ResourceKeyDefinition(typeof(Style), "BottomFabTabBarItemStyle", TargetType = typeof(TabBarItem))]
-				public static Action<IDependencyPropertyBuilder<Style>> BottomFab => StaticResource.Get<Style>("BottomFabTabBarItemStyle");
+				public static ResourceValue<Style> BottomFab => new("BottomFabTabBarItemStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "BottomTabBarItemStyle", TargetType = typeof(TabBarItem))]
-				public static Action<IDependencyPropertyBuilder<Style>> Bottom => StaticResource.Get<Style>("BottomTabBarItemStyle");
+				public static ResourceValue<Style> Bottom => new("BottomTabBarItemStyle");
 			}
 		}
 	}

From 2e239bc36d3385b49dee695c39ed728714ab1978 Mon Sep 17 00:00:00 2001
From: AndresAldana <andres.aldana@horus.com.uy>
Date: Wed, 28 Dec 2022 10:22:33 -0500
Subject: [PATCH 5/5] chore: change default as main

---
 src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
index 6c9b61b60..2c154f9b8 100644
--- a/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
+++ b/src/library/Uno.Toolkit.WinUI.Themes.Markup/Theme.Styles.cs
@@ -10,8 +10,10 @@ public static class Styles
 		{
 			public static class AppBarButton
 			{
+				public static ResourceValue<Style> Default => Main;
+
 				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
-				public static ResourceValue<Style> Default => new("MainCommandStyle");
+				public static ResourceValue<Style> Main => new("MainCommandStyle");
 
 				[ResourceKeyDefinition(typeof(Style), "MainCommandStyle", TargetType = typeof(AppBarButton))]
 				public static ResourceValue<Style> Modal => new("ModalMainCommandStyle");