Skip to content

Commit

Permalink
Merge pull request #1210 from unoplatform/dev/ds/resource-value-update
Browse files Browse the repository at this point in the history 
Update Uno.Extensions.Markup
  • Loading branch information
@carldebilly
carldebilly authored Sep 26, 2023
2 parents 7e9fdb0 + 330eb76 commit a235530
Show file tree
Hide file tree
Showing 10 changed files with 686 additions and 704 deletions.
4 changes: 2 additions & 2 deletions src/library/Uno.Material.WinUI.Markup/Uno.Material.WinUI.Markup.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">

<!--
Adding project references to this project requires some manual adjustments.
Expand All @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="1.0.0-dev.187" />
<PackageReference Include="Uno.Extensions.Markup.Generators" PrivateAssets="All" Version="5.0.0-dev.407" />
</ItemGroup>

<PropertyGroup>
Expand Down
25 changes: 0 additions & 25 deletions src/library/Uno.Themes.WinUI.Markup/ResourceValue.cs
View file

This file was deleted.

621 changes: 311 additions & 310 deletions src/library/Uno.Themes.WinUI.Markup/Theme.Brushes.cs
View file

Large diffs are not rendered by default.

67 changes: 34 additions & 33 deletions src/library/Uno.Themes.WinUI.Markup/Theme.Colors.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Uno.Extensions.Markup.Internals;
using Uno.Extensions.Markup;
using Uno.Extensions.Markup.Internals;
using Windows.UI;

namespace Uno.Themes.Markup
Expand All @@ -10,136 +11,136 @@ public static class Colors
public static class Primary
{
[ResourceKeyDefinition(typeof(Color), "PrimaryColor")]
public static ResourceValue<Color> Default => new("PrimaryColor", true);
public static ThemeResourceKey<Color> Default => new("PrimaryColor");

[ResourceKeyDefinition(typeof(Color), "PrimaryInverseColor")]
public static ResourceValue<Color> Inverse => new("PrimaryInverseColor", true);
public static ThemeResourceKey<Color> Inverse => new("PrimaryInverseColor");

[ResourceKeyDefinition(typeof(Color), "PrimaryContainerColor")]
public static ResourceValue<Color> Container => new("PrimaryContainerColor", true);
public static ThemeResourceKey<Color> Container => new("PrimaryContainerColor");

[ResourceKeyDefinition(typeof(Color), "PrimaryVariantDarkColor")]
public static ResourceValue<Color> VariantDark => new("PrimaryVariantDarkColor", true);
public static ThemeResourceKey<Color> VariantDark => new("PrimaryVariantDarkColor");

[ResourceKeyDefinition(typeof(Color), "PrimaryVariantLightColor")]
public static ResourceValue<Color> VariantLight => new("PrimaryVariantLightColor", true);
public static ThemeResourceKey<Color> VariantLight => new("PrimaryVariantLightColor");
}

public static class OnPrimary
{
[ResourceKeyDefinition(typeof(Color), "OnPrimaryColor")]
public static ResourceValue<Color> Default => new("OnPrimaryColor", true);
public static ThemeResourceKey<Color> Default => new("OnPrimaryColor");

[ResourceKeyDefinition(typeof(Color), "OnPrimaryContainerColor")]
public static ResourceValue<Color> Container => new("OnPrimaryContainerColor", true);
public static ThemeResourceKey<Color> Container => new("OnPrimaryContainerColor");
}

public static class Secondary
{
[ResourceKeyDefinition(typeof(Color), "SecondaryColor")]
public static ResourceValue<Color> Default => new("SecondaryColor", true);
public static ThemeResourceKey<Color> Default => new("SecondaryColor");

[ResourceKeyDefinition(typeof(Color), "SecondaryContainerColor")]
public static ResourceValue<Color> Container => new("SecondaryContainerColor", true);
public static ThemeResourceKey<Color> Container => new("SecondaryContainerColor");

[ResourceKeyDefinition(typeof(Color), "SecondaryVariantDarkColor")]
public static ResourceValue<Color> VariantDark => new("SecondaryVariantDarkColor", true);
public static ThemeResourceKey<Color> VariantDark => new("SecondaryVariantDarkColor");

[ResourceKeyDefinition(typeof(Color), "SecondaryVariantLightColor")]
public static ResourceValue<Color> VariantLight => new("SecondaryVariantLightColor", true);
public static ThemeResourceKey<Color> VariantLight => new("SecondaryVariantLightColor");
}

public static class OnSecondary
{
[ResourceKeyDefinition(typeof(Color), "OnSecondaryColor")]
public static ResourceValue<Color> Default => new("OnSecondaryColor", true);
public static ThemeResourceKey<Color> Default => new("OnSecondaryColor");

[ResourceKeyDefinition(typeof(Color), "OnSecondaryContainerColor")]
public static ResourceValue<Color> Container => new("OnSecondaryContainerColor", true);
public static ThemeResourceKey<Color> Container => new("OnSecondaryContainerColor");
}

public static class Tertiary
{
[ResourceKeyDefinition(typeof(Color), "TertiaryColor")]
public static ResourceValue<Color> Default => new("TertiaryColor", true);
public static ThemeResourceKey<Color> Default => new("TertiaryColor");

[ResourceKeyDefinition(typeof(Color), "TertiaryContainerColor")]
public static ResourceValue<Color> Container => new("TertiaryContainerColor", true);
public static ThemeResourceKey<Color> Container => new("TertiaryContainerColor");
}

public static class OnTertiary
{
[ResourceKeyDefinition(typeof(Color), "OnTertiaryColor")]
public static ResourceValue<Color> Default => new("OnTertiaryColor", true);
public static ThemeResourceKey<Color> Default => new("OnTertiaryColor");

[ResourceKeyDefinition(typeof(Color), "OnTertiaryContainerColor")]
public static ResourceValue<Color> Container => new("OnTertiaryContainerColor", true);
public static ThemeResourceKey<Color> Container => new("OnTertiaryContainerColor");
}

public static class Error
{
[ResourceKeyDefinition(typeof(Color), "ErrorColor")]
public static ResourceValue<Color> Default => new("ErrorColor", true);
public static ThemeResourceKey<Color> Default => new("ErrorColor");

[ResourceKeyDefinition(typeof(Color), "ErrorContainerColor")]
public static ResourceValue<Color> Container => new("ErrorContainerColor", true);
public static ThemeResourceKey<Color> Container => new("ErrorContainerColor");
}

public static class OnError
{
[ResourceKeyDefinition(typeof(Color), "OnErrorColor")]
public static ResourceValue<Color> Default => new("OnErrorColor", true);
public static ThemeResourceKey<Color> Default => new("OnErrorColor");

[ResourceKeyDefinition(typeof(Color), "OnErrorContainerColor")]
public static ResourceValue<Color> Container => new("OnErrorContainerColor", true);
public static ThemeResourceKey<Color> Container => new("OnErrorContainerColor");
}

public static class Background
{
[ResourceKeyDefinition(typeof(Color), "BackgroundColor")]
public static ResourceValue<Color> Default => new("BackgroundColor", true);
public static ThemeResourceKey<Color> Default => new("BackgroundColor");
}

public static class OnBackground
{
[ResourceKeyDefinition(typeof(Color), "OnBackgroundColor")]
public static ResourceValue<Color> Default => new("OnBackgroundColor", true);
public static ThemeResourceKey<Color> Default => new("OnBackgroundColor");
}

public static class Surface
{
[ResourceKeyDefinition(typeof(Color), "SurfaceColor")]
public static ResourceValue<Color> Default => new("SurfaceColor", true);
public static ThemeResourceKey<Color> Default => new("SurfaceColor");

[ResourceKeyDefinition(typeof(Color), "SurfaceVariantColor")]
public static ResourceValue<Color> Variant => new("SurfaceVariantColor", true);
public static ThemeResourceKey<Color> Variant => new("SurfaceVariantColor");

[ResourceKeyDefinition(typeof(Color), "SurfaceInverseColor")]
public static ResourceValue<Color> Inverse => new("SurfaceInverseColor", true);
public static ThemeResourceKey<Color> Inverse => new("SurfaceInverseColor");

[ResourceKeyDefinition(typeof(Color), "SurfaceTintColor")]
public static ResourceValue<Color> Tint => new("SurfaceTintColor", true);
public static ThemeResourceKey<Color> Tint => new("SurfaceTintColor");
}

public static class OnSurface
{
[ResourceKeyDefinition(typeof(Color), "OnSurfaceColor")]
public static ResourceValue<Color> Default => new("OnSurfaceColor", true);
public static ThemeResourceKey<Color> Default => new("OnSurfaceColor");

[ResourceKeyDefinition(typeof(Color), "OnSurfaceVariantColor")]
public static ResourceValue<Color> Variant => new("OnSurfaceVariantColor", true);
public static ThemeResourceKey<Color> Variant => new("OnSurfaceVariantColor");

[ResourceKeyDefinition(typeof(Color), "OnSurfaceInverseColor")]
public static ResourceValue<Color> Inverse => new("OnSurfaceInverseColor", true);
public static ThemeResourceKey<Color> Inverse => new("OnSurfaceInverseColor");
}

public static class Outline
{
[ResourceKeyDefinition(typeof(Color), "OutlineColor")]
public static ResourceValue<Color> Default => new("OutlineColor", true);
public static ThemeResourceKey<Color> Default => new("OutlineColor");

[ResourceKeyDefinition(typeof(Color), "OutlineVariantColor")]
public static ResourceValue<Color> Variant => new ("OutlineVariantColor", true);
public static ThemeResourceKey<Color> Variant => new ("OutlineVariantColor");
}

}
Expand Down
Loading

0 comments on commit a235530

Please sign in to comment.