Skip to content

Commit

Permalink
Generate colors from calcite-design-system resources instead
Browse files Browse the repository at this point in the history
Note: Major renames in color and brush resources (mostly `CalciteUI*` renamed to `Calcite*`)
  • Loading branch information
dotMorten committed Feb 11, 2025
1 parent 87e5914 commit d43a6ed
Show file tree
Hide file tree
Showing 54 changed files with 2,207 additions and 2,816 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "calcite-colors"]
path = calcite-colors
url = https://github.com/Esri/calcite-colors
[submodule "calcite-design-system"]
path = calcite-design-system
url = https://github.com/Esri/calcite-design-system
8 changes: 4 additions & 4 deletions GenerateResources.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rmdir GeneratedResources /S /Q

dotnet run --project Tools\ResourceGenerator\ResourceGenerator.csproj ..\calcite-design-system\packages\calcite-ui-icons\\docs\keywords.json ..\calcite-design-system\packages\calcite-ui-icons\fantasticonrc.json calcite-colors\dist\colors.scss GeneratedResources\WPF WPF
dotnet run --project Tools\ResourceGenerator\ResourceGenerator.csproj ..\calcite-design-system\packages\calcite-ui-icons\\docs\keywords.json ..\calcite-design-system\packages\calcite-ui-icons\fantasticonrc.json calcite-colors\dist\colors.scss GeneratedResources\Maui Maui
dotnet run --project Tools\ResourceGenerator\ResourceGenerator.csproj ..\calcite-design-system\packages\calcite-ui-icons\\docs\keywords.json ..\calcite-design-system\packages\calcite-ui-icons\fantasticonrc.json calcite-colors\dist\colors.scss GeneratedResources\WinUI WinUI
dotnet run --project Tools\ResourceGenerator\ResourceGenerator.csproj ..\calcite-design-system\packages\calcite-ui-icons\\docs\keywords.json ..\calcite-design-system\packages\calcite-ui-icons\fantasticonrc.json calcite-colors\dist\colors.scss GeneratedResources\UWP UWP
dotnet run --project Tools\ResourceGenerator\ResourceGenerator.csproj ..\calcite-design-system\packages\calcite-ui-icons\\docs\keywords.json ..\calcite-design-system\packages\calcite-ui-icons\fantasticonrc.json calcite-design-system\packages\calcite-design-tokens GeneratedResources\WPF WPF
dotnet run --project Tools\ResourceGenerator\ResourceGenerator.csproj ..\calcite-design-system\packages\calcite-ui-icons\\docs\keywords.json ..\calcite-design-system\packages\calcite-ui-icons\fantasticonrc.json calcite-design-system\packages\calcite-design-tokens GeneratedResources\Maui Maui
dotnet run --project Tools\ResourceGenerator\ResourceGenerator.csproj ..\calcite-design-system\packages\calcite-ui-icons\\docs\keywords.json ..\calcite-design-system\packages\calcite-ui-icons\fantasticonrc.json calcite-design-system\packages\calcite-design-tokens GeneratedResources\WinUI WinUI
dotnet run --project Tools\ResourceGenerator\ResourceGenerator.csproj ..\calcite-design-system\packages\calcite-ui-icons\\docs\keywords.json ..\calcite-design-system\packages\calcite-ui-icons\fantasticonrc.json calcite-design-system\packages\calcite-design-tokens GeneratedResources\UWP UWP
63 changes: 40 additions & 23 deletions GeneratedResources/Maui/Colors/Brushes.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,44 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Colors.xaml" />
</ResourceDictionary.MergedDictionaries>
<SolidColorBrush x:Key="CalciteUIBrandBrush" Color="{AppThemeBinding Dark={x:DynamicResource CalciteUIBrandDarkColor}, Light={x:DynamicResource CalciteUIBrandLightColor}}" />
<SolidColorBrush x:Key="CalciteUIBrandHoverBrush" Color="{AppThemeBinding Dark={x:DynamicResource CalciteUIBrandHoverDarkColor}, Light={x:DynamicResource CalciteUIBrandHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteUIBrandPressBrush" Color="{AppThemeBinding Dark={x:DynamicResource CalciteUIBrandPressDarkColor}, Light={x:DynamicResource CalciteUIBrandPressLightColor}}" />
<SolidColorBrush x:Key="CalciteUIBackgroundBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUIBackgroundDarkColor}, Light={StaticResource CalciteUIBackgroundLightColor}}" />
<SolidColorBrush x:Key="CalciteUIBackground1Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIBackground1DarkColor}, Light={StaticResource CalciteUIBackground1LightColor}}" />
<SolidColorBrush x:Key="CalciteUIBackground2Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIBackground2DarkColor}, Light={StaticResource CalciteUIBackground2LightColor}}" />
<SolidColorBrush x:Key="CalciteUIBackground3Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIBackground3DarkColor}, Light={StaticResource CalciteUIBackground3LightColor}}" />
<SolidColorBrush x:Key="CalciteUIText1Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIText1DarkColor}, Light={StaticResource CalciteUIText1LightColor}}" />
<SolidColorBrush x:Key="CalciteUIText2Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIText2DarkColor}, Light={StaticResource CalciteUIText2LightColor}}" />
<SolidColorBrush x:Key="CalciteUIText3Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIText3DarkColor}, Light={StaticResource CalciteUIText3LightColor}}" />
<SolidColorBrush x:Key="CalciteUITextHighlightBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUITextHighlightDarkColor}, Light={StaticResource CalciteUITextHighlightLightColor}}" />
<SolidColorBrush x:Key="CalciteUITextInverseBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUITextInverseDarkColor}, Light={StaticResource CalciteUITextInverseLightColor}}" />
<SolidColorBrush x:Key="CalciteUITextLinkBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUITextLinkDarkColor}, Light={StaticResource CalciteUITextLinkLightColor}}" />
<SolidColorBrush x:Key="CalciteUIBorder1Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIBorder1DarkColor}, Light={StaticResource CalciteUIBorder1LightColor}}" />
<SolidColorBrush x:Key="CalciteUIBorder2Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIBorder2DarkColor}, Light={StaticResource CalciteUIBorder2LightColor}}" />
<SolidColorBrush x:Key="CalciteUIBorder3Brush" Color="{AppThemeBinding Dark={StaticResource CalciteUIBorder3DarkColor}, Light={StaticResource CalciteUIBorder3LightColor}}" />
<SolidColorBrush x:Key="CalciteUIBorderInputBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUIBorderInputDarkColor}, Light={StaticResource CalciteUIBorderInputLightColor}}" />
<SolidColorBrush x:Key="CalciteUIInfoBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUIInfoDarkColor}, Light={StaticResource CalciteUIInfoLightColor}}" />
<SolidColorBrush x:Key="CalciteUISuccessBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUISuccessDarkColor}, Light={StaticResource CalciteUISuccessLightColor}}" />
<SolidColorBrush x:Key="CalciteUIWarningBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUIWarningDarkColor}, Light={StaticResource CalciteUIWarningLightColor}}" />
<SolidColorBrush x:Key="CalciteUIDangerBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUIDangerDarkColor}, Light={StaticResource CalciteUIDangerLightColor}}" />
<SolidColorBrush x:Key="CalciteUIDangerHoverBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUIDangerHoverDarkColor}, Light={StaticResource CalciteUIDangerHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteUIDangerPressBrush" Color="{AppThemeBinding Dark={StaticResource CalciteUIDangerPressDarkColor}, Light={StaticResource CalciteUIDangerPressLightColor}}" />
<SolidColorBrush x:Key="CalciteBackgroundBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBackgroundDarkColor}, Light={StaticResource CalciteBackgroundLightColor}}" />
<SolidColorBrush x:Key="CalciteBorder1Brush" Color="{AppThemeBinding Dark={StaticResource CalciteBorder1DarkColor}, Light={StaticResource CalciteBorder1LightColor}}" />
<SolidColorBrush x:Key="CalciteBorder2Brush" Color="{AppThemeBinding Dark={StaticResource CalciteBorder2DarkColor}, Light={StaticResource CalciteBorder2LightColor}}" />
<SolidColorBrush x:Key="CalciteBorder3Brush" Color="{AppThemeBinding Dark={StaticResource CalciteBorder3DarkColor}, Light={StaticResource CalciteBorder3LightColor}}" />
<SolidColorBrush x:Key="CalciteBorderGhostBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBorderGhostDarkColor}, Light={StaticResource CalciteBorderGhostLightColor}}" />
<SolidColorBrush x:Key="CalciteBorderInputBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBorderInputDarkColor}, Light={StaticResource CalciteBorderInputLightColor}}" />
<SolidColorBrush x:Key="CalciteBorderWhiteBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBorderWhiteDarkColor}, Light={StaticResource CalciteBorderWhiteLightColor}}" />
<SolidColorBrush x:Key="CalciteBrandBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBrandDarkColor}, Light={StaticResource CalciteBrandLightColor}}" />
<SolidColorBrush x:Key="CalciteBrandHoverBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBrandHoverDarkColor}, Light={StaticResource CalciteBrandHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteBrandPressBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBrandPressDarkColor}, Light={StaticResource CalciteBrandPressLightColor}}" />
<SolidColorBrush x:Key="CalciteBrandUnderlineBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBrandUnderlineDarkColor}, Light={StaticResource CalciteBrandUnderlineLightColor}}" />
<SolidColorBrush x:Key="CalciteBackground1Brush" Color="{AppThemeBinding Dark={StaticResource CalciteBackground1DarkColor}, Light={StaticResource CalciteBackground1LightColor}}" />
<SolidColorBrush x:Key="CalciteBackground2Brush" Color="{AppThemeBinding Dark={StaticResource CalciteBackground2DarkColor}, Light={StaticResource CalciteBackground2LightColor}}" />
<SolidColorBrush x:Key="CalciteBackground3Brush" Color="{AppThemeBinding Dark={StaticResource CalciteBackground3DarkColor}, Light={StaticResource CalciteBackground3LightColor}}" />
<SolidColorBrush x:Key="CalciteBackgroundCurrentBrush" Color="{AppThemeBinding Dark={StaticResource CalciteBackgroundCurrentDarkColor}, Light={StaticResource CalciteBackgroundCurrentLightColor}}" />
<SolidColorBrush x:Key="CalciteInverseBrush" Color="{AppThemeBinding Dark={StaticResource CalciteInverseDarkColor}, Light={StaticResource CalciteInverseLightColor}}" />
<SolidColorBrush x:Key="CalciteInverseHoverBrush" Color="{AppThemeBinding Dark={StaticResource CalciteInverseHoverDarkColor}, Light={StaticResource CalciteInverseHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteInversePressBrush" Color="{AppThemeBinding Dark={StaticResource CalciteInversePressDarkColor}, Light={StaticResource CalciteInversePressLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusDangerBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusDangerDarkColor}, Light={StaticResource CalciteStatusDangerLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusDangerHoverBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusDangerHoverDarkColor}, Light={StaticResource CalciteStatusDangerHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusDangerPressBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusDangerPressDarkColor}, Light={StaticResource CalciteStatusDangerPressLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusInfoBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusInfoDarkColor}, Light={StaticResource CalciteStatusInfoLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusInfoHoverBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusInfoHoverDarkColor}, Light={StaticResource CalciteStatusInfoHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusInfoPressBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusInfoPressDarkColor}, Light={StaticResource CalciteStatusInfoPressLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusSuccessBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusSuccessDarkColor}, Light={StaticResource CalciteStatusSuccessLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusSuccessHoverBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusSuccessHoverDarkColor}, Light={StaticResource CalciteStatusSuccessHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusSuccessPressBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusSuccessPressDarkColor}, Light={StaticResource CalciteStatusSuccessPressLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusWarningBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusWarningDarkColor}, Light={StaticResource CalciteStatusWarningLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusWarningHoverBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusWarningHoverDarkColor}, Light={StaticResource CalciteStatusWarningHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteStatusWarningPressBrush" Color="{AppThemeBinding Dark={StaticResource CalciteStatusWarningPressDarkColor}, Light={StaticResource CalciteStatusWarningPressLightColor}}" />
<SolidColorBrush x:Key="CalciteText1Brush" Color="{AppThemeBinding Dark={StaticResource CalciteText1DarkColor}, Light={StaticResource CalciteText1LightColor}}" />
<SolidColorBrush x:Key="CalciteText2Brush" Color="{AppThemeBinding Dark={StaticResource CalciteText2DarkColor}, Light={StaticResource CalciteText2LightColor}}" />
<SolidColorBrush x:Key="CalciteText3Brush" Color="{AppThemeBinding Dark={StaticResource CalciteText3DarkColor}, Light={StaticResource CalciteText3LightColor}}" />
<SolidColorBrush x:Key="CalciteTextInverseBrush" Color="{AppThemeBinding Dark={StaticResource CalciteTextInverseDarkColor}, Light={StaticResource CalciteTextInverseLightColor}}" />
<SolidColorBrush x:Key="CalciteTextLinkBrush" Color="{AppThemeBinding Dark={StaticResource CalciteTextLinkDarkColor}, Light={StaticResource CalciteTextLinkLightColor}}" />
<SolidColorBrush x:Key="CalciteTransparentBrush" Color="{AppThemeBinding Dark={StaticResource CalciteTransparentDarkColor}, Light={StaticResource CalciteTransparentLightColor}}" />
<SolidColorBrush x:Key="CalciteTransparentHoverBrush" Color="{AppThemeBinding Dark={StaticResource CalciteTransparentHoverDarkColor}, Light={StaticResource CalciteTransparentHoverLightColor}}" />
<SolidColorBrush x:Key="CalciteTransparentPressBrush" Color="{AppThemeBinding Dark={StaticResource CalciteTransparentPressDarkColor}, Light={StaticResource CalciteTransparentPressLightColor}}" />
<SolidColorBrush x:Key="CalciteTransparentScrimBrush" Color="{AppThemeBinding Dark={StaticResource CalciteTransparentScrimDarkColor}, Light={StaticResource CalciteTransparentScrimLightColor}}" />
<SolidColorBrush x:Key="CalciteTransparentTintBrush" Color="{AppThemeBinding Dark={StaticResource CalciteTransparentTintDarkColor}, Light={StaticResource CalciteTransparentTintLightColor}}" />
</ResourceDictionary>
Loading

0 comments on commit d43a6ed

Please sign in to comment.