From 694dd863fa66e03cb9f2d8a6fa4f13e036ab0c8f Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 27 Jun 2024 18:08:58 +0800 Subject: [PATCH] feat: add active colors to palette --- .../ViewModels/PaletteDemoViewModel.cs | 14 +++++++------- src/Semi.Avalonia/Themes/Dark/Palette.axaml | 7 +++++++ src/Semi.Avalonia/Themes/Light/Palette.axaml | 7 +++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs index 3c79a75..f772889 100644 --- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs +++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs @@ -251,7 +251,7 @@ public static class ColorTokens { new ("SemiColorPrimary", "Primary"), new ("SemiColorPrimaryPointerover", "Primary Pointerover"), - new ("SemiColorPrimaryPressed", "Primary Pressed"), + new ("SemiColorPrimaryActive", "Primary Active"), new ("SemiColorPrimaryDisabled", "Primary Disabled"), new ("SemiColorPrimaryLight", "Primary Light"), new ("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"), @@ -262,7 +262,7 @@ public static class ColorTokens { new ("SemiColorSecondary", "Secondary"), new ("SemiColorSecondaryPointerover", "Secondary Pointerover"), - new ("SemiColorSecondaryPressed", "Secondary Pressed"), + new ("SemiColorSecondaryActive", "Secondary Active"), new ("SemiColorSecondaryDisabled", "Secondary Disabled"), new ("SemiColorSecondaryLight", "Secondary Light"), new ("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"), @@ -273,7 +273,7 @@ public static class ColorTokens { new ("SemiColorTertiary", "Tertiary"), new ("SemiColorTertiaryPointerover", "Tertiary Pointerover"), - new ("SemiColorTertiaryPressed", "Tertiary Pressed"), + new ("SemiColorTertiaryActive", "Tertiary Active"), new ("SemiColorTertiaryLight", "Tertiary Light"), new ("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"), new ("SemiColorTertiaryLightActive", "Tertiary Light Active"), @@ -283,7 +283,7 @@ public static class ColorTokens { new ("SemiColorInformation", "Information"), new ("SemiColorInformationPointerover", "Information Pointerover"), - new ("SemiColorInformationPressed", "Information Pressed"), + new ("SemiColorInformationActive", "Information Active"), new ("SemiColorInformationDisabled", "Information Disabled"), new ("SemiColorInformationLight", "Information Light"), new ("SemiColorInformationLightPointerover", "Information Light Pointerover"), @@ -294,7 +294,7 @@ public static class ColorTokens { new ("SemiColorSuccess", "Success"), new ("SemiColorSuccessPointerover", "Success Pointerover"), - new ("SemiColorSuccessPressed", "Success Pressed"), + new ("SemiColorSuccessActive", "Success Active"), new ("SemiColorSuccessDisabled", "Success Disabled"), new ("SemiColorSuccessLight", "Success Light"), new ("SemiColorSuccessLightPointerover", "Success Light Pointerover"), @@ -305,7 +305,7 @@ public static class ColorTokens { new ("SemiColorWarning", "Warning"), new ("SemiColorWarningPointerover", "Warning Pointerover"), - new ("SemiColorWarningPressed", "Warning Pressed"), + new ("SemiColorWarningActive", "Warning Active"), new ("SemiColorWarningLight", "Warning Light"), new ("SemiColorWarningLightPointerover", "Warning Light Pointerover"), new ("SemiColorWarningLightActive", "Warning Light Active"), @@ -315,7 +315,7 @@ public static class ColorTokens { new ("SemiColorDanger", "Danger"), new ("SemiColorDangerPointerover", "Danger Pointerover"), - new ("SemiColorDangerPressed", "Danger Pressed"), + new ("SemiColorDangerActive", "Danger Active"), new ("SemiColorDangerLight", "Danger Light"), new ("SemiColorDangerLightPointerover", "Danger Light Pointerover"), new ("SemiColorDangerLightActive", "Danger Light Active"), diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Themes/Dark/Palette.axaml index 1bb73ab..6960964 100644 --- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml @@ -326,6 +326,7 @@ + @@ -334,6 +335,7 @@ + @@ -342,6 +344,7 @@ + @@ -349,6 +352,7 @@ + @@ -357,6 +361,7 @@ + @@ -365,6 +370,7 @@ + @@ -372,6 +378,7 @@ + diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml index 63aa057..bec6dd8 100644 --- a/src/Semi.Avalonia/Themes/Light/Palette.axaml +++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml @@ -326,6 +326,7 @@ + @@ -334,6 +335,7 @@ + @@ -342,6 +344,7 @@ + @@ -349,6 +352,7 @@ + @@ -357,6 +361,7 @@ + @@ -365,6 +370,7 @@ + @@ -372,6 +378,7 @@ +