zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-03-03 00:00:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc: unify tokens.

Browse Source
This commit is contained in:
Zhang Dian
2025-01-23 13:46:50 +08:00
parent 2da0733bdf
commit 98dd72e9e3
5 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
demo/Semi.Avalonia.Demo/Constant/ColorTokens.cs
View File

@@ -114,6 +114,7 @@ public static class ColorTokens
public static IReadOnlyList<Tuple<string, string>> BorderTokens { get; } = new List<Tuple<string, string>>
{
new("SemiColorBorder", "Border"),
new("SemiColorFocusBorder", "Focus Border"),
};
public static IReadOnlyList<Tuple<string, string>> DisabledTokens { get; } = new List<Tuple<string, string>>
@@ -124,6 +125,16 @@ public static class ColorTokens
new("SemiColorDisabledFill", "Disabled Fill"),
};
public static IReadOnlyList<Tuple<string, string>> OtherTokens { get; } = new List<Tuple<string, string>>
{
new("SemiColorWhite", "White"),
new("SemiColorBlack", "Black"),
new("SemiColorNavBackground", "Navigation Background"),
new("SemiColorOverlayBackground", "Overlay Background"),
new("SemiColorHighlightBackground", "Highlight Background"),
new("SemiColorHighlight", "Highlight Text"),
};
public static IReadOnlyList<Tuple<string, string>> ShadowTokens { get; } = new List<Tuple<string, string>>
{
new("SemiColorShadow", "Shadow"),

2
demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
View File

@@ -91,6 +91,8 @@ public partial class PaletteDemoViewModel : ObservableObject
"Border", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BorderTokens));
FunctionalColors.Add(new FunctionalColorGroupViewModel(
"Disabled", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DisabledTokens));
FunctionalColors.Add(new FunctionalColorGroupViewModel(
"Others", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.OtherTokens));
}
private void InitializeShadows()

26
src/Semi.Avalonia/Tokens/Palette/Dark.axaml
View File

@@ -330,7 +330,7 @@
<SolidColorBrush x:Key="SemiGrey7" Color="{StaticResource SemiGrey7Color}" />
<SolidColorBrush x:Key="SemiGrey8" Color="{StaticResource SemiGrey8Color}" />
<SolidColorBrush x:Key="SemiGrey9" Color="{StaticResource SemiGrey9Color}" />
<!-- Official Color=#E4E7F5 -->
<SolidColorBrush x:Key="SemiColorWhite" Color="{StaticResource SemiWhiteColor}" />
<SolidColorBrush x:Key="SemiColorBlack" Color="{StaticResource SemiBlackColor}" />
<!-- Primary -->
@@ -414,10 +414,6 @@
<!-- Border -->
<SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="{StaticResource SemiWhiteColor}" />
<SolidColorBrush x:Key="SemiColorFocusBorder" Color="{StaticResource SemiBlue5Color}" />
<SolidColorBrush x:Key="SemiColorNavBackground" Color="{StaticResource SemiBackground1Color}" />
<SolidColorBrush x:Key="SemiColorOverlayBackground" Opacity="0.6" Color="{StaticResource SemiBackground0Color}" />
<SolidColorBrush x:Key="SemiColorHighlightBackground" Color="{StaticResource SemiYellow4Color}" />
<SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource SemiBlackColor}" />
<!-- Disabled -->
<SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
@@ -426,16 +422,22 @@
<SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.04" Color="{StaticResource SemiGrey8Color}" />
<!-- Others -->
<SolidColorBrush x:Key="SemiColorNavBackground" Color="{StaticResource SemiBackground1Color}" />
<SolidColorBrush x:Key="SemiColorOverlayBackground" Opacity="0.6" Color="{StaticResource SemiBackground0Color}" />
<SolidColorBrush x:Key="SemiColorHighlightBackground" Color="{StaticResource SemiYellow4Color}" />
<SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource SemiBlackColor}" />
<!-- Shadow -->
<BoxShadows x:Key="SemiColorShadow">0 0 #0A000000</BoxShadows>
<BoxShadows x:Key="SemiShadowElevated">inset 0 0 0 1 #1AFFFFFF, 0 4 14 #40000000</BoxShadows>
<!-- Obsolete -->
<SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
<SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
<SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
<SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
<SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
<SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
<SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
<StaticResource x:Key="SemiColorPrimaryPressed" ResourceKey="SemiColorPrimaryActive" />
<StaticResource x:Key="SemiColorSecondaryPressed" ResourceKey="SemiColorSecondaryActive" />
<StaticResource x:Key="SemiColorTertiaryPressed" ResourceKey="SemiColorTertiaryActive" />
<StaticResource x:Key="SemiColorInformationPressed" ResourceKey="SemiColorInformationActive" />
<StaticResource x:Key="SemiColorSuccessPressed" ResourceKey="SemiColorSuccessActive" />
<StaticResource x:Key="SemiColorWarningPressed" ResourceKey="SemiColorWarningActive" />
<StaticResource x:Key="SemiColorDangerPressed" ResourceKey="SemiColorDangerActive" />
</ResourceDictionary>

24
src/Semi.Avalonia/Tokens/Palette/Light.axaml
View File

@@ -414,10 +414,6 @@
<!-- Border -->
<SolidColorBrush x:Key="SemiColorBorder" Opacity="0.08" Color="{StaticResource SemiGrey9Color}" />
<SolidColorBrush x:Key="SemiColorFocusBorder" Color="{StaticResource SemiBlue5Color}" />
<SolidColorBrush x:Key="SemiColorNavBackground" Color="{StaticResource SemiBackground1Color}" />
<SolidColorBrush x:Key="SemiColorOverlayBackground" Opacity="0.6" Color="#16161A" />
<SolidColorBrush x:Key="SemiColorHighlightBackground" Color="{StaticResource SemiYellow2Color}" />
<SolidColorBrush x:Key="SemiColorHighlightText" Color="{StaticResource SemiWhiteColor}" />
<!-- Disabled -->
<SolidColorBrush x:Key="SemiColorDisabledText" Opacity="0.35" Color="{StaticResource SemiGrey9Color}" />
@@ -426,16 +422,22 @@
<!-- Official Opacity=0.04 -->
<SolidColorBrush x:Key="SemiColorDisabledFill" Opacity="0.02" Color="{StaticResource SemiGrey8Color}" />
<!-- Others -->
<SolidColorBrush x:Key="SemiColorNavBackground" Color="{StaticResource SemiBackground1Color}" />
<SolidColorBrush x:Key="SemiColorOverlayBackground" Opacity="0.6" Color="#16161A" />
<SolidColorBrush x:Key="SemiColorHighlightBackground" Color="{StaticResource SemiYellow2Color}" />
<SolidColorBrush x:Key="SemiColorHighlight" Color="{StaticResource SemiWhiteColor}" />
<!-- Shadow -->
<BoxShadows x:Key="SemiColorShadow">0 0 #0A000000</BoxShadows>
<BoxShadows x:Key="SemiShadowElevated">0 0 1 #4A000000, 0 4 14 #1A000000</BoxShadows>
<!-- Obsolete -->
<SolidColorBrush x:Key="SemiColorPrimaryPressed" Color="{StaticResource SemiBlue7Color}" />
<SolidColorBrush x:Key="SemiColorSecondaryPressed" Color="{StaticResource SemiLightBlue7Color}" />
<SolidColorBrush x:Key="SemiColorTertiaryPressed" Color="{StaticResource SemiGrey7Color}" />
<SolidColorBrush x:Key="SemiColorInformationPressed" Color="{StaticResource SemiBlue7Color}" />
<SolidColorBrush x:Key="SemiColorSuccessPressed" Color="{StaticResource SemiGreen7Color}" />
<SolidColorBrush x:Key="SemiColorWarningPressed" Color="{StaticResource SemiOrange7Color}" />
<SolidColorBrush x:Key="SemiColorDangerPressed" Color="{StaticResource SemiRed7Color}" />
<StaticResource x:Key="SemiColorPrimaryPressed" ResourceKey="SemiColorPrimaryActive" />
<StaticResource x:Key="SemiColorSecondaryPressed" ResourceKey="SemiColorSecondaryActive" />
<StaticResource x:Key="SemiColorTertiaryPressed" ResourceKey="SemiColorTertiaryActive" />
<StaticResource x:Key="SemiColorInformationPressed" ResourceKey="SemiColorInformationActive" />
<StaticResource x:Key="SemiColorSuccessPressed" ResourceKey="SemiColorSuccessActive" />
<StaticResource x:Key="SemiColorWarningPressed" ResourceKey="SemiColorWarningActive" />
<StaticResource x:Key="SemiColorDangerPressed" ResourceKey="SemiColorDangerActive" />
</ResourceDictionary>

2
src/Semi.Avalonia/Tokens/Variables.axaml
View File

@@ -23,7 +23,7 @@
<CornerRadius x:Key="SemiBorderRadiusSmall">3</CornerRadius> <!-- 圆角 - 小 -->
<CornerRadius x:Key="SemiBorderRadiusMedium">6</CornerRadius> <!-- 圆角 - 中 -->
<CornerRadius x:Key="SemiBorderRadiusLarge">12</CornerRadius> <!-- 圆角 - 大 -->
<CornerRadius x:Key="SemiBorderRadiusFull">999</CornerRadius> <!-- 圆角 - 全圆 -->
<CornerRadius x:Key="SemiBorderRadiusFull">9999</CornerRadius> <!-- 圆角 - 全圆 -->
<!-- Spacing -->
<x:Double x:Key="SemiSpacingNone">0</x:Double> <!-- 间距 - 零 -->