From 9f43baa039eb31c575b15ff313b9f83066781146 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sun, 26 Mar 2023 19:38:12 +0800 Subject: [PATCH 01/10] fix: improve nullable annotation. --- .../Controls/FunctionalColorGroupControl.cs | 12 +++--- .../ViewModels/PaletteDemoViewModel.cs | 43 +++++++++++-------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs index b7bbb44..7a17dee 100644 --- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs +++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs @@ -14,19 +14,19 @@ public class FunctionalColorGroupControl: TemplatedControl set => SetValue(TitleProperty, value); } - public static readonly DirectProperty LightColorsProperty = AvaloniaProperty.RegisterDirect( + public static readonly DirectProperty LightColorsProperty = AvaloniaProperty.RegisterDirect( nameof(LightColors), o => o.LightColors, (o, v) => o.LightColors = v); - private IEnumerable _lightColors; - public IEnumerable LightColors + private IEnumerable? _lightColors; + public IEnumerable? LightColors { get => _lightColors; set => SetAndRaise(LightColorsProperty, ref _lightColors, value); } - public static readonly DirectProperty DarkColorsProperty = AvaloniaProperty.RegisterDirect( + public static readonly DirectProperty DarkColorsProperty = AvaloniaProperty.RegisterDirect( nameof(DarkColors), o => o.DarkColors, (o, v) => o.DarkColors = v); - private IEnumerable _darkColors; - public IEnumerable DarkColors + private IEnumerable? _darkColors; + public IEnumerable? DarkColors { get => _darkColors; set => SetAndRaise(DarkColorsProperty, ref _darkColors, value); diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs index 33f98f1..75fe787 100644 --- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs +++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs @@ -12,10 +12,10 @@ namespace Semi.Avalonia.Demo.ViewModels; public class PaletteDemoViewModel: ObservableObject { private readonly string[] _predefinedColorNames = { "Amber","Blue","Cyan","Green","Grey","Indigo","LightBlue","LightGreen","Lime","Orange","Pink","Purple","Red","Teal","Violet","Yellow" }; - private IResourceDictionary _lightResourceDictionary; - private IResourceDictionary _darkResourceDictionary; + private readonly IResourceDictionary? _lightResourceDictionary; + private readonly IResourceDictionary? _darkResourceDictionary; - private ColorItemViewModel _selectedColor; + private ColorItemViewModel _selectedColor = null!; public ColorItemViewModel SelectedColor { @@ -24,14 +24,14 @@ public class PaletteDemoViewModel: ObservableObject } - private ObservableCollection _lightLists; - public ObservableCollection LightLists + private ObservableCollection? _lightLists; + public ObservableCollection? LightLists { get => _lightLists; set => SetProperty(ref _lightLists, value); } - private ObservableCollection _darkLists; - public ObservableCollection DarkLists + private ObservableCollection? _darkLists; + public ObservableCollection? DarkLists { get => _darkLists; set => SetProperty(ref _darkLists, value); @@ -41,8 +41,8 @@ public class PaletteDemoViewModel: ObservableObject public PaletteDemoViewModel() { - _lightResourceDictionary = (ResourceDictionary)AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Light/Palette.axaml")); - _darkResourceDictionary = (ResourceDictionary)AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Dark/Palette.axaml")); + _lightResourceDictionary = AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Light/Palette.axaml")) as ResourceDictionary; + _darkResourceDictionary = AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Dark/Palette.axaml")) as ResourceDictionary; WeakReferenceMessenger.Default.Register(this, OnClickColorItem); } @@ -110,8 +110,12 @@ public class ColorListViewModel: ObservableObject set => SetProperty(ref _seriesName, value); } - internal void Initialize(IResourceDictionary resourceDictionary, string color, bool light) + internal void Initialize(IResourceDictionary? resourceDictionary, string color, bool light) { + if (resourceDictionary is null) + { + return; + } SeriesName = color; Color = new ObservableCollection(); @@ -134,28 +138,28 @@ public class ColorListViewModel: ObservableObject public class ColorItemViewModel : ObservableObject { - private IBrush _brush; + private IBrush _brush = null!; public IBrush Brush { get => _brush; set => SetProperty(ref _brush, value); } - private IBrush _textBrush; + private IBrush _textBrush = null!; public IBrush TextBrush { get => _textBrush; set => SetProperty(ref _textBrush, value); } - private string _colorDisplayName; + private string _colorDisplayName = null!; public string ColorDisplayName { get => _colorDisplayName; set => SetProperty(ref _colorDisplayName, value); } - private string _resourceKey; + private string _resourceKey = null!; public string ResourceKey { @@ -163,7 +167,7 @@ public class ColorItemViewModel : ObservableObject set => SetProperty(ref _resourceKey, value); } - private string _hex; + private string _hex = null!; public string Hex { @@ -190,7 +194,7 @@ public class ColorItemViewModel : ObservableObject public class FunctionalColorGroupViewModel : ObservableObject { - private string _title; + private string _title = null!; public string Title { get => _title; @@ -200,21 +204,22 @@ public class FunctionalColorGroupViewModel : ObservableObject public ObservableCollection LightColors { get; set; } = new(); public ObservableCollection DarkColors { get; set; } = new(); - public FunctionalColorGroupViewModel(string title, IResourceDictionary lightDictionary, IResourceDictionary darkDictionary, IReadOnlyList> tokens) + public FunctionalColorGroupViewModel(string title, IResourceDictionary? lightDictionary, IResourceDictionary? darkDictionary, IReadOnlyList> tokens) { Title = title; foreach (var token in tokens) { string key = token.Item1; string name = token.Item2; - if (lightDictionary.TryGetValue(key, out var lightValue)) + if (lightDictionary?.TryGetValue(key, out var lightValue) ?? false) { if (lightValue is ISolidColorBrush lightBrush) { LightColors.Add(new ColorItemViewModel(name, lightBrush, key, true, 0)); } } - if (darkDictionary.TryGetValue(key, out var darkValue)) + + if (darkDictionary?.TryGetValue(key, out var darkValue) ?? false) { if (darkValue is ISolidColorBrush darkBrush) { From 3639239dfe06e3ebf7a790c638ba4c9b604fbf49 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sun, 26 Mar 2023 20:04:04 +0800 Subject: [PATCH 02/10] feat: add color resources, change brush definition to color reference. --- src/Semi.Avalonia/Themes/Dark/Palette.axaml | 483 +++++++++++++------ src/Semi.Avalonia/Themes/Light/Palette.axaml | 481 ++++++++++++------ 2 files changed, 644 insertions(+), 320 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Themes/Dark/Palette.axaml index 923c8b5..79aafe4 100644 --- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml @@ -1,165 +1,327 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + #6C090B + #901110 + #B42019 + #D73324 + #FB4932 + #FC725A + #FD9983 + #FDBEAC + #FEE0D5 + #FFF3EF + #5C0730 + #800E41 + #A41751 + #C72261 + #EB2F71 + #EF5686 + #F37E9F + #F7A8BC + #FBD3DC + #FDEEF1 + #4A1061 + #5E1776 + #731F8A + #89289F + #A033B3 + #B553C2 + #CA78D1 + #DDA0E1 + #EFCEF0 + #F7EBF7 + #401B77 + #4C248C + #582EA0 + #6439B5 + #7246C9 + #8865D4 + #A288DF + #BEADE9 + #DDD4F4 + #F1EEFA + #171E65 + #20297A + #29368E + #3444A3 + #4053B7 + #5F71C5 + #8191D4 + #A7B4E2 + #D1D8F1 + #EDEFF8 + #053170 + #0A4694 + #135CB8 + #1D75DB + #2990FF + #54A9FF + #7FC1FF + #A9D7FF + #D4ECFF + #EFF8FF + #003761 + #004D85 + #0366A9 + #0A81CC + #139FF0 + #40B4F3 + #6EC8F6 + #9DDCF9 + #CEEEFC + #EBF8FE + #04343D + #074F5C + #0A6C7B + #0E8999 + #13A8B8 + #38BBC6 + #62CDD4 + #91DFE3 + #C6EFF1 + #E7F7F8 + #023C39 + #045A55 + #07776F + #0A9588 + #0EB3A1 + #33C2B0 + #5ED1C1 + #8EE1D3 + #C4F0E8 + #E6F7F4 + #123C19 + #1C5A25 + #277731 + #32953D + #3EB349 + #5DC264 + #7FD184 + #A6E1A8 + #D0F0D1 + #ECF7EC + #263D13 + #3B5C1D + #517B28 + #679934 + #7FB840 + #97C65F + #B0D481 + #C9E3A7 + #E4F1D1 + #F3F8ED + #314603 + #4B6905 + #678D09 + #84B00C + #A2D311 + #AEDC3A + #BDE566 + #CFED96 + #E5F6C9 + #F3FBE9 + #544903 + #7E6C06 + #A88E0A + #D2AF0F + #FCCE14 + #FDDE43 + #FDEB71 + #FEF5A0 + #FEFBD0 + #FFFEEC + #512E09 + #794B0F + #A16B16 + #CA8F1E + #F2B726 + #F5CA50 + #F7DB7A + #FAEAA6 + #FCF6D2 + #FEFBED + #551F03 + #803506 + #AA500A + #D56F0F + #FF9214 + #FFAE43 + #FFC772 + #FFDDA1 + #FFEFD0 + #FFF9ED + #1C1F23 + #2E3238 + #41464C + #555B61 + #6B7075 + #888D92 + #A7ABB0 + #C6CACD + #E6E8EA + #F9F9F9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -247,4 +409,5 @@ + diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml index d9b789e..f7eed42 100644 --- a/src/Semi.Avalonia/Themes/Light/Palette.axaml +++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml @@ -1,165 +1,326 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + #FEFBEB + #FCF5CE + #F9E89E + #F6D86F + #F3C641 + #F0B114 + #C88A0F + #A0660A + #784606 + #502B03 + #EAF5FF + #CBE7FE + #98CDFD + #65B2FC + #3295FB + #0077FA + #0062D6 + #004FB3 + #003D8F + #002C6B + #E5F7F8 + #C2EFF0 + #8ADDE2 + #58CBD3 + #2CB8C5 + #05A4B6 + #038698 + #016979 + #004D5B + #00323D + #ECF7EC + #D0F0D1 + #A4E0A7 + #7DD182 + #5AC262 + #3BB346 + #30953B + #25772F + #1B5924 + #113C18 + #F9F9F9 + #E6E8EA + #C6CACD + #A7ABB0 + #888D92 + #6B7075 + #555B61 + #41464C + #2E3238 + #1C1F23 + #ECEFF8 + #D1D8F0 + #A7B3E1 + #8090D3 + #5E6FC4 + #3F51B5 + #3342A1 + #28348C + #1F2878 + #171D63 + #E9F7FD + #C9ECFC + #95D8F8 + #62C3F5 + #30ACF1 + #0095EE + #007BCA + #0063A7 + #004B83 + #00355F + #F3F8EC + #E3F0D0 + #C8E2A5 + #ADD37E + #93C55B + #7BB63C + #649830 + #4E7926 + #395B1B + #253D12 + #F2FAE6 + #E3F6C5 + #CBED8E + #B7E35B + #A7DA2C + #9BD100 + #7EAE00 + #638B00 + #486800 + #2F4600 + #FFF8EA + #FEEECC + #FED998 + #FDC165 + #FDA633 + #FC8800 + #D26700 + #A84A00 + #7E3100 + #541D00 + #FDECEF + #FBCFD8 + #F6A0B5 + #F27396 + #ED487B + #E91E63 + #C51356 + #A20B48 + #7E053A + #5A012B + #F7E9F7 + #EFCAF0 + #DD9BE0 + #C96FD1 + #B449C2 + #9E28B3 + #871E9E + #71168A + #5C0F75 + #490A61 + #FEF2ED + #FEDDD2 + #FDB7A5 + #FB9078 + #FA664C + #F93920 + #D52515 + #B2140C + #8E0805 + #6A0103 + #E4F7F4 + #C0F0E8 + #87E0D3 + #54D1C1 + #27C2B0 + #00B3A1 + #009589 + #00776F + #005955 + #003C3A + #F3EDF9 + #E2D1F4 + #C4A7E9 + #A67FDD + #885BD2 + #6A3AC7 + #572FB3 + #46259E + #361C8A + #281475 + #FFFDEA + #FEFBCB + #FDF398 + #FCE865 + #FBDA32 + #FAC800 + #D0AA00 + #A78B00 + #7D6A00 + #534800 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 15ce60bcdb6a2274b5b5216756e99e309795c749 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sun, 26 Mar 2023 20:23:22 +0800 Subject: [PATCH 03/10] feat: change functional brushes to use color resource. --- src/Semi.Avalonia/Themes/Light/Palette.axaml | 124 +++++++++---------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml index f7eed42..60681b9 100644 --- a/src/Semi.Avalonia/Themes/Light/Palette.axaml +++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml @@ -323,70 +323,70 @@ - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + @@ -396,16 +396,16 @@ - - - + + + - + - - - - + + + + From 43305be6bfabd68292ba22c14768b6d44a1ac6a7 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sun, 26 Mar 2023 20:32:55 +0800 Subject: [PATCH 04/10] feat: update dark palette reference. --- src/Semi.Avalonia/Themes/Dark/Palette.axaml | 116 ++++++++++---------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Themes/Dark/Palette.axaml index 79aafe4..6ac643c 100644 --- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Palette.axaml @@ -324,70 +324,70 @@ - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + @@ -405,9 +405,9 @@ - - - - + + + + From 1a512e589d1d706f5f9d6ea37b63a1d43e31c1c8 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sun, 26 Mar 2023 20:57:03 +0800 Subject: [PATCH 05/10] feat: Add Dark/Light color palette. --- .../Pages/ColorPickerDemo.axaml | 9 ++---- src/Semi.Avalonia.ColorPicker/Dark.axaml | 7 ++++- src/Semi.Avalonia.ColorPicker/Light.axaml | 6 +++- .../Semi.Avalonia.ColorPicker.csproj | 2 +- .../SemiColorDarkPalette.cs | 29 +++++++++++++++++++ .../SemiColorLightPalette.cs | 29 +++++++++++++++++++ 6 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs create mode 100644 src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs diff --git a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml index fd16eff..f04f907 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/ColorPickerDemo.axaml @@ -2,6 +2,7 @@ x:Class="Semi.Avalonia.Demo.Pages.ColorPickerDemo" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:colorPicker="clr-namespace:Semi.Avalonia.ColorPicker;assembly=Semi.Avalonia.ColorPicker" xmlns:controls="using:Avalonia.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" @@ -15,11 +16,7 @@ Spacing="20"> - - - - - + @@ -29,7 +26,7 @@ - + diff --git a/src/Semi.Avalonia.ColorPicker/Dark.axaml b/src/Semi.Avalonia.ColorPicker/Dark.axaml index e6029e7..a910256 100644 --- a/src/Semi.Avalonia.ColorPicker/Dark.axaml +++ b/src/Semi.Avalonia.ColorPicker/Dark.axaml @@ -1,4 +1,7 @@ - + @@ -40,4 +43,6 @@ 3 0 0 14 0 #1AFFFFFF + + diff --git a/src/Semi.Avalonia.ColorPicker/Light.axaml b/src/Semi.Avalonia.ColorPicker/Light.axaml index c3eb57d..070ce03 100644 --- a/src/Semi.Avalonia.ColorPicker/Light.axaml +++ b/src/Semi.Avalonia.ColorPicker/Light.axaml @@ -1,4 +1,7 @@ - + @@ -40,4 +43,5 @@ 3 0 0 14 0 #1A000000 + diff --git a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj index a4331ef..312db02 100644 --- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj +++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj @@ -1,6 +1,6 @@ - + Semi.Avalonia.ColorPicker diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs new file mode 100644 index 0000000..96dff33 --- /dev/null +++ b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs @@ -0,0 +1,29 @@ +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Utilities; + +namespace Semi.Avalonia.ColorPicker; + +public class SemiColorDarkPalette: IColorPalette +{ + private static readonly Color[,] Colors = new Color[,] + { + { + Color.FromUInt32(0xFF6C090B), + }, + { + Color.FromUInt32(0xFF6C090B), + } + }; + public Color GetColor(int colorIndex, int shadeIndex) + { + return Colors[ + MathUtilities.Clamp(colorIndex, 0, ColorCount - 1), + MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1) + ]; + } + + public int ColorCount => Colors.GetLength(0); + + public int ShadeCount => Colors.GetLength(1); +} diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs new file mode 100644 index 0000000..2d1a646 --- /dev/null +++ b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs @@ -0,0 +1,29 @@ +using Avalonia.Controls; +using Avalonia.Media; +using Avalonia.Utilities; + +namespace Semi.Avalonia.ColorPicker; + +public class SemiColorLightPalette: IColorPalette +{ + private static readonly Color[,] Colors = new Color[,] + { + { + Color.FromUInt32(0xFFFEF2ED), + }, + { + Color.FromUInt32(0xFFFEF2ED), + } + }; + public Color GetColor(int colorIndex, int shadeIndex) + { + return Colors[ + MathUtilities.Clamp(colorIndex, 0, ColorCount - 1), + MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1) + ]; + } + + public int ColorCount => Colors.GetLength(0); + + public int ShadeCount => Colors.GetLength(1); +} \ No newline at end of file From 6f4c0dd5cd73cb4ac12059197a6adf7b7aa8bb3c Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sun, 26 Mar 2023 21:37:32 +0800 Subject: [PATCH 06/10] feat: color order. --- .../ViewModels/PaletteDemoViewModel.cs | 8 +- src/Semi.Avalonia/Themes/Light/Palette.axaml | 240 +++++++++--------- 2 files changed, 127 insertions(+), 121 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs index 75fe787..5509a29 100644 --- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs +++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs @@ -11,7 +11,13 @@ namespace Semi.Avalonia.Demo.ViewModels; public class PaletteDemoViewModel: ObservableObject { - private readonly string[] _predefinedColorNames = { "Amber","Blue","Cyan","Green","Grey","Indigo","LightBlue","LightGreen","Lime","Orange","Pink","Purple","Red","Teal","Violet","Yellow" }; + private readonly string[] _predefinedColorNames = + { + "Red", "Pink", "Purple", "Violet", "Indigo", + "Blue", "LightBlue", "Cyan", "Teal", "Green", + "LightGreen", "Lime", "Yellow", "Amber", "Orange", + "Grey" + }; private readonly IResourceDictionary? _lightResourceDictionary; private readonly IResourceDictionary? _darkResourceDictionary; diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Themes/Light/Palette.axaml index 60681b9..25e68d3 100644 --- a/src/Semi.Avalonia/Themes/Light/Palette.axaml +++ b/src/Semi.Avalonia/Themes/Light/Palette.axaml @@ -1,105 +1,15 @@ - #FEFBEB - #FCF5CE - #F9E89E - #F6D86F - #F3C641 - #F0B114 - #C88A0F - #A0660A - #784606 - #502B03 - #EAF5FF - #CBE7FE - #98CDFD - #65B2FC - #3295FB - #0077FA - #0062D6 - #004FB3 - #003D8F - #002C6B - #E5F7F8 - #C2EFF0 - #8ADDE2 - #58CBD3 - #2CB8C5 - #05A4B6 - #038698 - #016979 - #004D5B - #00323D - #ECF7EC - #D0F0D1 - #A4E0A7 - #7DD182 - #5AC262 - #3BB346 - #30953B - #25772F - #1B5924 - #113C18 - #F9F9F9 - #E6E8EA - #C6CACD - #A7ABB0 - #888D92 - #6B7075 - #555B61 - #41464C - #2E3238 - #1C1F23 - #ECEFF8 - #D1D8F0 - #A7B3E1 - #8090D3 - #5E6FC4 - #3F51B5 - #3342A1 - #28348C - #1F2878 - #171D63 - #E9F7FD - #C9ECFC - #95D8F8 - #62C3F5 - #30ACF1 - #0095EE - #007BCA - #0063A7 - #004B83 - #00355F - #F3F8EC - #E3F0D0 - #C8E2A5 - #ADD37E - #93C55B - #7BB63C - #649830 - #4E7926 - #395B1B - #253D12 - #F2FAE6 - #E3F6C5 - #CBED8E - #B7E35B - #A7DA2C - #9BD100 - #7EAE00 - #638B00 - #486800 - #2F4600 - #FFF8EA - #FEEECC - #FED998 - #FDC165 - #FDA633 - #FC8800 - #D26700 - #A84A00 - #7E3100 - #541D00 + #FEF2ED + #FEDDD2 + #FDB7A5 + #FB9078 + #FA664C + #F93920 + #D52515 + #B2140C + #8E0805 + #6A0103 #FDECEF #FBCFD8 #F6A0B5 @@ -120,26 +30,6 @@ #71168A #5C0F75 #490A61 - #FEF2ED - #FEDDD2 - #FDB7A5 - #FB9078 - #FA664C - #F93920 - #D52515 - #B2140C - #8E0805 - #6A0103 - #E4F7F4 - #C0F0E8 - #87E0D3 - #54D1C1 - #27C2B0 - #00B3A1 - #009589 - #00776F - #005955 - #003C3A #F3EDF9 #E2D1F4 #C4A7E9 @@ -150,6 +40,86 @@ #46259E #361C8A #281475 + #ECEFF8 + #D1D8F0 + #A7B3E1 + #8090D3 + #5E6FC4 + #3F51B5 + #3342A1 + #28348C + #1F2878 + #171D63 + #EAF5FF + #CBE7FE + #98CDFD + #65B2FC + #3295FB + #0077FA + #0062D6 + #004FB3 + #003D8F + #002C6B + #E9F7FD + #C9ECFC + #95D8F8 + #62C3F5 + #30ACF1 + #0095EE + #007BCA + #0063A7 + #004B83 + #00355F + #E5F7F8 + #C2EFF0 + #8ADDE2 + #58CBD3 + #2CB8C5 + #05A4B6 + #038698 + #016979 + #004D5B + #00323D + #E4F7F4 + #C0F0E8 + #87E0D3 + #54D1C1 + #27C2B0 + #00B3A1 + #009589 + #00776F + #005955 + #003C3A + #ECF7EC + #D0F0D1 + #A4E0A7 + #7DD182 + #5AC262 + #3BB346 + #30953B + #25772F + #1B5924 + #113C18 + #F3F8EC + #E3F0D0 + #C8E2A5 + #ADD37E + #93C55B + #7BB63C + #649830 + #4E7926 + #395B1B + #253D12 + #F2FAE6 + #E3F6C5 + #CBED8E + #B7E35B + #A7DA2C + #9BD100 + #7EAE00 + #638B00 + #486800 + #2F4600 #FFFDEA #FEFBCB #FDF398 @@ -160,6 +130,36 @@ #A78B00 #7D6A00 #534800 + #FEFBEB + #FCF5CE + #F9E89E + #F6D86F + #F3C641 + #F0B114 + #C88A0F + #A0660A + #784606 + #502B03 + #FFF8EA + #FEEECC + #FED998 + #FDC165 + #FDA633 + #FC8800 + #D26700 + #A84A00 + #7E3100 + #541D00 + #F9F9F9 + #E6E8EA + #C6CACD + #A7ABB0 + #888D92 + #6B7075 + #555B61 + #41464C + #2E3238 + #1C1F23 From d1739cc88fe57244f7b2b3c98f346618166e12fb Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sun, 26 Mar 2023 21:46:14 +0800 Subject: [PATCH 07/10] feat: copy colors. --- .../SemiColorDarkPalette.cs | 318 ++++++++++++++++++ .../SemiColorLightPalette.cs | 318 ++++++++++++++++++ 2 files changed, 636 insertions(+) diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs index 96dff33..e166600 100644 --- a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs +++ b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs @@ -10,9 +10,327 @@ public class SemiColorDarkPalette: IColorPalette { { Color.FromUInt32(0xFF6C090B), + Color.FromUInt32(0xFF901110), + Color.FromUInt32(0xFFB42019), + Color.FromUInt32(0xFFD73324), + Color.FromUInt32(0xFFFB4932), + Color.FromUInt32(0xFFFC725A), + Color.FromUInt32(0xFFFD9983), + Color.FromUInt32(0xFFFDBEAC), + Color.FromUInt32(0xFFFEE0D5), + Color.FromUInt32(0xFFFFF3EF), + Color.FromUInt32(0xFF5C0730), + Color.FromUInt32(0xFF800E41), + Color.FromUInt32(0xFFA41751), + Color.FromUInt32(0xFFC72261), + Color.FromUInt32(0xFFEB2F71), + Color.FromUInt32(0xFFEF5686), + Color.FromUInt32(0xFFF37E9F), + Color.FromUInt32(0xFFF7A8BC), + Color.FromUInt32(0xFFFBD3DC), + Color.FromUInt32(0xFFFDEEF1), + Color.FromUInt32(0xFF4A1061), + Color.FromUInt32(0xFF5E1776), + Color.FromUInt32(0xFF731F8A), + Color.FromUInt32(0xFF89289F), + Color.FromUInt32(0xFFA033B3), + Color.FromUInt32(0xFFB553C2), + Color.FromUInt32(0xFFCA78D1), + Color.FromUInt32(0xFFDDA0E1), + Color.FromUInt32(0xFFEFCEF0), + Color.FromUInt32(0xFFF7EBF7), + Color.FromUInt32(0xFF401B77), + Color.FromUInt32(0xFF4C248C), + Color.FromUInt32(0xFF582EA0), + Color.FromUInt32(0xFF6439B5), + Color.FromUInt32(0xFF7246C9), + Color.FromUInt32(0xFF8865D4), + Color.FromUInt32(0xFFA288DF), + Color.FromUInt32(0xFFBEADE9), + Color.FromUInt32(0xFFDDD4F4), + Color.FromUInt32(0xFFF1EEFA), + Color.FromUInt32(0xFF171E65), + Color.FromUInt32(0xFF20297A), + Color.FromUInt32(0xFF29368E), + Color.FromUInt32(0xFF3444A3), + Color.FromUInt32(0xFF4053B7), + Color.FromUInt32(0xFF5F71C5), + Color.FromUInt32(0xFF8191D4), + Color.FromUInt32(0xFFA7B4E2), + Color.FromUInt32(0xFFD1D8F1), + Color.FromUInt32(0xFFEDEFF8), + Color.FromUInt32(0xFF053170), + Color.FromUInt32(0xFF0A4694), + Color.FromUInt32(0xFF135CB8), + Color.FromUInt32(0xFF1D75DB), + Color.FromUInt32(0xFF2990FF), + Color.FromUInt32(0xFF54A9FF), + Color.FromUInt32(0xFF7FC1FF), + Color.FromUInt32(0xFFA9D7FF), + Color.FromUInt32(0xFFD4ECFF), + Color.FromUInt32(0xFFEFF8FF), + Color.FromUInt32(0xFF003761), + Color.FromUInt32(0xFF004D85), + Color.FromUInt32(0xFF0366A9), + Color.FromUInt32(0xFF0A81CC), + Color.FromUInt32(0xFF139FF0), + Color.FromUInt32(0xFF40B4F3), + Color.FromUInt32(0xFF6EC8F6), + Color.FromUInt32(0xFF9DDCF9), + Color.FromUInt32(0xFFCEEEFC), + Color.FromUInt32(0xFFEBF8FE), + Color.FromUInt32(0xFF04343D), + Color.FromUInt32(0xFF074F5C), + Color.FromUInt32(0xFF0A6C7B), + Color.FromUInt32(0xFF0E8999), + Color.FromUInt32(0xFF13A8B8), + Color.FromUInt32(0xFF38BBC6), + Color.FromUInt32(0xFF62CDD4), + Color.FromUInt32(0xFF91DFE3), + Color.FromUInt32(0xFFC6EFF1), + Color.FromUInt32(0xFFE7F7F8), + Color.FromUInt32(0xFF023C39), + Color.FromUInt32(0xFF045A55), + Color.FromUInt32(0xFF07776F), + Color.FromUInt32(0xFF0A9588), + Color.FromUInt32(0xFF0EB3A1), + Color.FromUInt32(0xFF33C2B0), + Color.FromUInt32(0xFF5ED1C1), + Color.FromUInt32(0xFF8EE1D3), + Color.FromUInt32(0xFFC4F0E8), + Color.FromUInt32(0xFFE6F7F4), + Color.FromUInt32(0xFF123C19), + Color.FromUInt32(0xFF1C5A25), + Color.FromUInt32(0xFF277731), + Color.FromUInt32(0xFF32953D), + Color.FromUInt32(0xFF3EB349), + Color.FromUInt32(0xFF5DC264), + Color.FromUInt32(0xFF7FD184), + Color.FromUInt32(0xFFA6E1A8), + Color.FromUInt32(0xFFD0F0D1), + Color.FromUInt32(0xFFECF7EC), + Color.FromUInt32(0xFF263D13), + Color.FromUInt32(0xFF3B5C1D), + Color.FromUInt32(0xFF517B28), + Color.FromUInt32(0xFF679934), + Color.FromUInt32(0xFF7FB840), + Color.FromUInt32(0xFF97C65F), + Color.FromUInt32(0xFFB0D481), + Color.FromUInt32(0xFFC9E3A7), + Color.FromUInt32(0xFFE4F1D1), + Color.FromUInt32(0xFFF3F8ED), + Color.FromUInt32(0xFF314603), + Color.FromUInt32(0xFF4B6905), + Color.FromUInt32(0xFF678D09), + Color.FromUInt32(0xFF84B00C), + Color.FromUInt32(0xFFA2D311), + Color.FromUInt32(0xFFAEDC3A), + Color.FromUInt32(0xFFBDE566), + Color.FromUInt32(0xFFCFED96), + Color.FromUInt32(0xFFE5F6C9), + Color.FromUInt32(0xFFF3FBE9), + Color.FromUInt32(0xFF544903), + Color.FromUInt32(0xFF7E6C06), + Color.FromUInt32(0xFFA88E0A), + Color.FromUInt32(0xFFD2AF0F), + Color.FromUInt32(0xFFFCCE14), + Color.FromUInt32(0xFFFDDE43), + Color.FromUInt32(0xFFFDEB71), + Color.FromUInt32(0xFFFEF5A0), + Color.FromUInt32(0xFFFEFBD0), + Color.FromUInt32(0xFFFFFEEC), + Color.FromUInt32(0xFF512E09), + Color.FromUInt32(0xFF794B0F), + Color.FromUInt32(0xFFA16B16), + Color.FromUInt32(0xFFCA8F1E), + Color.FromUInt32(0xFFF2B726), + Color.FromUInt32(0xFFF5CA50), + Color.FromUInt32(0xFFF7DB7A), + Color.FromUInt32(0xFFFAEAA6), + Color.FromUInt32(0xFFFCF6D2), + Color.FromUInt32(0xFFFEFBED), + Color.FromUInt32(0xFF551F03), + Color.FromUInt32(0xFF803506), + Color.FromUInt32(0xFFAA500A), + Color.FromUInt32(0xFFD56F0F), + Color.FromUInt32(0xFFFF9214), + Color.FromUInt32(0xFFFFAE43), + Color.FromUInt32(0xFFFFC772), + Color.FromUInt32(0xFFFFDDA1), + Color.FromUInt32(0xFFFFEFD0), + Color.FromUInt32(0xFFFFF9ED), + Color.FromUInt32(0xFF1C1F23), + Color.FromUInt32(0xFF2E3238), + Color.FromUInt32(0xFF41464C), + Color.FromUInt32(0xFF555B61), + Color.FromUInt32(0xFF6B7075), + Color.FromUInt32(0xFF888D92), + Color.FromUInt32(0xFFA7ABB0), + Color.FromUInt32(0xFFC6CACD), + Color.FromUInt32(0xFFE6E8EA), + Color.FromUInt32(0xFFF9F9F9), }, { Color.FromUInt32(0xFF6C090B), + Color.FromUInt32(0xFF901110), + Color.FromUInt32(0xFFB42019), + Color.FromUInt32(0xFFD73324), + Color.FromUInt32(0xFFFB4932), + Color.FromUInt32(0xFFFC725A), + Color.FromUInt32(0xFFFD9983), + Color.FromUInt32(0xFFFDBEAC), + Color.FromUInt32(0xFFFEE0D5), + Color.FromUInt32(0xFFFFF3EF), + Color.FromUInt32(0xFF5C0730), + Color.FromUInt32(0xFF800E41), + Color.FromUInt32(0xFFA41751), + Color.FromUInt32(0xFFC72261), + Color.FromUInt32(0xFFEB2F71), + Color.FromUInt32(0xFFEF5686), + Color.FromUInt32(0xFFF37E9F), + Color.FromUInt32(0xFFF7A8BC), + Color.FromUInt32(0xFFFBD3DC), + Color.FromUInt32(0xFFFDEEF1), + Color.FromUInt32(0xFF4A1061), + Color.FromUInt32(0xFF5E1776), + Color.FromUInt32(0xFF731F8A), + Color.FromUInt32(0xFF89289F), + Color.FromUInt32(0xFFA033B3), + Color.FromUInt32(0xFFB553C2), + Color.FromUInt32(0xFFCA78D1), + Color.FromUInt32(0xFFDDA0E1), + Color.FromUInt32(0xFFEFCEF0), + Color.FromUInt32(0xFFF7EBF7), + Color.FromUInt32(0xFF401B77), + Color.FromUInt32(0xFF4C248C), + Color.FromUInt32(0xFF582EA0), + Color.FromUInt32(0xFF6439B5), + Color.FromUInt32(0xFF7246C9), + Color.FromUInt32(0xFF8865D4), + Color.FromUInt32(0xFFA288DF), + Color.FromUInt32(0xFFBEADE9), + Color.FromUInt32(0xFFDDD4F4), + Color.FromUInt32(0xFFF1EEFA), + Color.FromUInt32(0xFF171E65), + Color.FromUInt32(0xFF20297A), + Color.FromUInt32(0xFF29368E), + Color.FromUInt32(0xFF3444A3), + Color.FromUInt32(0xFF4053B7), + Color.FromUInt32(0xFF5F71C5), + Color.FromUInt32(0xFF8191D4), + Color.FromUInt32(0xFFA7B4E2), + Color.FromUInt32(0xFFD1D8F1), + Color.FromUInt32(0xFFEDEFF8), + Color.FromUInt32(0xFF053170), + Color.FromUInt32(0xFF0A4694), + Color.FromUInt32(0xFF135CB8), + Color.FromUInt32(0xFF1D75DB), + Color.FromUInt32(0xFF2990FF), + Color.FromUInt32(0xFF54A9FF), + Color.FromUInt32(0xFF7FC1FF), + Color.FromUInt32(0xFFA9D7FF), + Color.FromUInt32(0xFFD4ECFF), + Color.FromUInt32(0xFFEFF8FF), + Color.FromUInt32(0xFF003761), + Color.FromUInt32(0xFF004D85), + Color.FromUInt32(0xFF0366A9), + Color.FromUInt32(0xFF0A81CC), + Color.FromUInt32(0xFF139FF0), + Color.FromUInt32(0xFF40B4F3), + Color.FromUInt32(0xFF6EC8F6), + Color.FromUInt32(0xFF9DDCF9), + Color.FromUInt32(0xFFCEEEFC), + Color.FromUInt32(0xFFEBF8FE), + Color.FromUInt32(0xFF04343D), + Color.FromUInt32(0xFF074F5C), + Color.FromUInt32(0xFF0A6C7B), + Color.FromUInt32(0xFF0E8999), + Color.FromUInt32(0xFF13A8B8), + Color.FromUInt32(0xFF38BBC6), + Color.FromUInt32(0xFF62CDD4), + Color.FromUInt32(0xFF91DFE3), + Color.FromUInt32(0xFFC6EFF1), + Color.FromUInt32(0xFFE7F7F8), + Color.FromUInt32(0xFF023C39), + Color.FromUInt32(0xFF045A55), + Color.FromUInt32(0xFF07776F), + Color.FromUInt32(0xFF0A9588), + Color.FromUInt32(0xFF0EB3A1), + Color.FromUInt32(0xFF33C2B0), + Color.FromUInt32(0xFF5ED1C1), + Color.FromUInt32(0xFF8EE1D3), + Color.FromUInt32(0xFFC4F0E8), + Color.FromUInt32(0xFFE6F7F4), + Color.FromUInt32(0xFF123C19), + Color.FromUInt32(0xFF1C5A25), + Color.FromUInt32(0xFF277731), + Color.FromUInt32(0xFF32953D), + Color.FromUInt32(0xFF3EB349), + Color.FromUInt32(0xFF5DC264), + Color.FromUInt32(0xFF7FD184), + Color.FromUInt32(0xFFA6E1A8), + Color.FromUInt32(0xFFD0F0D1), + Color.FromUInt32(0xFFECF7EC), + Color.FromUInt32(0xFF263D13), + Color.FromUInt32(0xFF3B5C1D), + Color.FromUInt32(0xFF517B28), + Color.FromUInt32(0xFF679934), + Color.FromUInt32(0xFF7FB840), + Color.FromUInt32(0xFF97C65F), + Color.FromUInt32(0xFFB0D481), + Color.FromUInt32(0xFFC9E3A7), + Color.FromUInt32(0xFFE4F1D1), + Color.FromUInt32(0xFFF3F8ED), + Color.FromUInt32(0xFF314603), + Color.FromUInt32(0xFF4B6905), + Color.FromUInt32(0xFF678D09), + Color.FromUInt32(0xFF84B00C), + Color.FromUInt32(0xFFA2D311), + Color.FromUInt32(0xFFAEDC3A), + Color.FromUInt32(0xFFBDE566), + Color.FromUInt32(0xFFCFED96), + Color.FromUInt32(0xFFE5F6C9), + Color.FromUInt32(0xFFF3FBE9), + Color.FromUInt32(0xFF544903), + Color.FromUInt32(0xFF7E6C06), + Color.FromUInt32(0xFFA88E0A), + Color.FromUInt32(0xFFD2AF0F), + Color.FromUInt32(0xFFFCCE14), + Color.FromUInt32(0xFFFDDE43), + Color.FromUInt32(0xFFFDEB71), + Color.FromUInt32(0xFFFEF5A0), + Color.FromUInt32(0xFFFEFBD0), + Color.FromUInt32(0xFFFFFEEC), + Color.FromUInt32(0xFF512E09), + Color.FromUInt32(0xFF794B0F), + Color.FromUInt32(0xFFA16B16), + Color.FromUInt32(0xFFCA8F1E), + Color.FromUInt32(0xFFF2B726), + Color.FromUInt32(0xFFF5CA50), + Color.FromUInt32(0xFFF7DB7A), + Color.FromUInt32(0xFFFAEAA6), + Color.FromUInt32(0xFFFCF6D2), + Color.FromUInt32(0xFFFEFBED), + Color.FromUInt32(0xFF551F03), + Color.FromUInt32(0xFF803506), + Color.FromUInt32(0xFFAA500A), + Color.FromUInt32(0xFFD56F0F), + Color.FromUInt32(0xFFFF9214), + Color.FromUInt32(0xFFFFAE43), + Color.FromUInt32(0xFFFFC772), + Color.FromUInt32(0xFFFFDDA1), + Color.FromUInt32(0xFFFFEFD0), + Color.FromUInt32(0xFFFFF9ED), + Color.FromUInt32(0xFF1C1F23), + Color.FromUInt32(0xFF2E3238), + Color.FromUInt32(0xFF41464C), + Color.FromUInt32(0xFF555B61), + Color.FromUInt32(0xFF6B7075), + Color.FromUInt32(0xFF888D92), + Color.FromUInt32(0xFFA7ABB0), + Color.FromUInt32(0xFFC6CACD), + Color.FromUInt32(0xFFE6E8EA), + Color.FromUInt32(0xFFF9F9F9), } }; public Color GetColor(int colorIndex, int shadeIndex) diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs index 2d1a646..441988b 100644 --- a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs +++ b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs @@ -10,9 +10,327 @@ public class SemiColorLightPalette: IColorPalette { { Color.FromUInt32(0xFFFEF2ED), + Color.FromUInt32(0xFFFEDDD2), + Color.FromUInt32(0xFFFDB7A5), + Color.FromUInt32(0xFFFB9078), + Color.FromUInt32(0xFFFA664C), + Color.FromUInt32(0xFFF93920), + Color.FromUInt32(0xFFD52515), + Color.FromUInt32(0xFFB2140C), + Color.FromUInt32(0xFF8E0805), + Color.FromUInt32(0xFF6A0103), + Color.FromUInt32(0xFFFDECEF), + Color.FromUInt32(0xFFFBCFD8), + Color.FromUInt32(0xFFF6A0B5), + Color.FromUInt32(0xFFF27396), + Color.FromUInt32(0xFFED487B), + Color.FromUInt32(0xFFE91E63), + Color.FromUInt32(0xFFC51356), + Color.FromUInt32(0xFFA20B48), + Color.FromUInt32(0xFF7E053A), + Color.FromUInt32(0xFF5A012B), + Color.FromUInt32(0xFFF7E9F7), + Color.FromUInt32(0xFFEFCAF0), + Color.FromUInt32(0xFFDD9BE0), + Color.FromUInt32(0xFFC96FD1), + Color.FromUInt32(0xFFB449C2), + Color.FromUInt32(0xFF9E28B3), + Color.FromUInt32(0xFF871E9E), + Color.FromUInt32(0xFF71168A), + Color.FromUInt32(0xFF5C0F75), + Color.FromUInt32(0xFF490A61), + Color.FromUInt32(0xFFF3EDF9), + Color.FromUInt32(0xFFE2D1F4), + Color.FromUInt32(0xFFC4A7E9), + Color.FromUInt32(0xFFA67FDD), + Color.FromUInt32(0xFF885BD2), + Color.FromUInt32(0xFF6A3AC7), + Color.FromUInt32(0xFF572FB3), + Color.FromUInt32(0xFF46259E), + Color.FromUInt32(0xFF361C8A), + Color.FromUInt32(0xFF281475), + Color.FromUInt32(0xFFECEFF8), + Color.FromUInt32(0xFFD1D8F0), + Color.FromUInt32(0xFFA7B3E1), + Color.FromUInt32(0xFF8090D3), + Color.FromUInt32(0xFF5E6FC4), + Color.FromUInt32(0xFF3F51B5), + Color.FromUInt32(0xFF3342A1), + Color.FromUInt32(0xFF28348C), + Color.FromUInt32(0xFF1F2878), + Color.FromUInt32(0xFF171D63), + Color.FromUInt32(0xFFEAF5FF), + Color.FromUInt32(0xFFCBE7FE), + Color.FromUInt32(0xFF98CDFD), + Color.FromUInt32(0xFF65B2FC), + Color.FromUInt32(0xFF3295FB), + Color.FromUInt32(0xFF0077FA), + Color.FromUInt32(0xFF0062D6), + Color.FromUInt32(0xFF004FB3), + Color.FromUInt32(0xFF003D8F), + Color.FromUInt32(0xFF002C6B), + Color.FromUInt32(0xFFE9F7FD), + Color.FromUInt32(0xFFC9ECFC), + Color.FromUInt32(0xFF95D8F8), + Color.FromUInt32(0xFF62C3F5), + Color.FromUInt32(0xFF30ACF1), + Color.FromUInt32(0xFF0095EE), + Color.FromUInt32(0xFF007BCA), + Color.FromUInt32(0xFF0063A7), + Color.FromUInt32(0xFF004B83), + Color.FromUInt32(0xFF00355F), + Color.FromUInt32(0xFFE5F7F8), + Color.FromUInt32(0xFFC2EFF0), + Color.FromUInt32(0xFF8ADDE2), + Color.FromUInt32(0xFF58CBD3), + Color.FromUInt32(0xFF2CB8C5), + Color.FromUInt32(0xFF05A4B6), + Color.FromUInt32(0xFF038698), + Color.FromUInt32(0xFF016979), + Color.FromUInt32(0xFF004D5B), + Color.FromUInt32(0xFF00323D), + Color.FromUInt32(0xFFE4F7F4), + Color.FromUInt32(0xFFC0F0E8), + Color.FromUInt32(0xFF87E0D3), + Color.FromUInt32(0xFF54D1C1), + Color.FromUInt32(0xFF27C2B0), + Color.FromUInt32(0xFF00B3A1), + Color.FromUInt32(0xFF009589), + Color.FromUInt32(0xFF00776F), + Color.FromUInt32(0xFF005955), + Color.FromUInt32(0xFF003C3A), + Color.FromUInt32(0xFFECF7EC), + Color.FromUInt32(0xFFD0F0D1), + Color.FromUInt32(0xFFA4E0A7), + Color.FromUInt32(0xFF7DD182), + Color.FromUInt32(0xFF5AC262), + Color.FromUInt32(0xFF3BB346), + Color.FromUInt32(0xFF30953B), + Color.FromUInt32(0xFF25772F), + Color.FromUInt32(0xFF1B5924), + Color.FromUInt32(0xFF113C18), + Color.FromUInt32(0xFFF3F8EC), + Color.FromUInt32(0xFFE3F0D0), + Color.FromUInt32(0xFFC8E2A5), + Color.FromUInt32(0xFFADD37E), + Color.FromUInt32(0xFF93C55B), + Color.FromUInt32(0xFF7BB63C), + Color.FromUInt32(0xFF649830), + Color.FromUInt32(0xFF4E7926), + Color.FromUInt32(0xFF395B1B), + Color.FromUInt32(0xFF253D12), + Color.FromUInt32(0xFFF2FAE6), + Color.FromUInt32(0xFFE3F6C5), + Color.FromUInt32(0xFFCBED8E), + Color.FromUInt32(0xFFB7E35B), + Color.FromUInt32(0xFFA7DA2C), + Color.FromUInt32(0xFF9BD100), + Color.FromUInt32(0xFF7EAE00), + Color.FromUInt32(0xFF638B00), + Color.FromUInt32(0xFF486800), + Color.FromUInt32(0xFF2F4600), + Color.FromUInt32(0xFFFFFDEA), + Color.FromUInt32(0xFFFEFBCB), + Color.FromUInt32(0xFFFDF398), + Color.FromUInt32(0xFFFCE865), + Color.FromUInt32(0xFFFBDA32), + Color.FromUInt32(0xFFFAC800), + Color.FromUInt32(0xFFD0AA00), + Color.FromUInt32(0xFFA78B00), + Color.FromUInt32(0xFF7D6A00), + Color.FromUInt32(0xFF534800), + Color.FromUInt32(0xFFFEFBEB), + Color.FromUInt32(0xFFFCF5CE), + Color.FromUInt32(0xFFF9E89E), + Color.FromUInt32(0xFFF6D86F), + Color.FromUInt32(0xFFF3C641), + Color.FromUInt32(0xFFF0B114), + Color.FromUInt32(0xFFC88A0F), + Color.FromUInt32(0xFFA0660A), + Color.FromUInt32(0xFF784606), + Color.FromUInt32(0xFF502B03), + Color.FromUInt32(0xFFFFF8EA), + Color.FromUInt32(0xFFFEEECC), + Color.FromUInt32(0xFFFED998), + Color.FromUInt32(0xFFFDC165), + Color.FromUInt32(0xFFFDA633), + Color.FromUInt32(0xFFFC8800), + Color.FromUInt32(0xFFD26700), + Color.FromUInt32(0xFFA84A00), + Color.FromUInt32(0xFF7E3100), + Color.FromUInt32(0xFF541D00), + Color.FromUInt32(0xFFF9F9F9), + Color.FromUInt32(0xFFE6E8EA), + Color.FromUInt32(0xFFC6CACD), + Color.FromUInt32(0xFFA7ABB0), + Color.FromUInt32(0xFF888D92), + Color.FromUInt32(0xFF6B7075), + Color.FromUInt32(0xFF555B61), + Color.FromUInt32(0xFF41464C), + Color.FromUInt32(0xFF2E3238), + Color.FromUInt32(0xFF1C1F23), }, { Color.FromUInt32(0xFFFEF2ED), + Color.FromUInt32(0xFFFEDDD2), + Color.FromUInt32(0xFFFDB7A5), + Color.FromUInt32(0xFFFB9078), + Color.FromUInt32(0xFFFA664C), + Color.FromUInt32(0xFFF93920), + Color.FromUInt32(0xFFD52515), + Color.FromUInt32(0xFFB2140C), + Color.FromUInt32(0xFF8E0805), + Color.FromUInt32(0xFF6A0103), + Color.FromUInt32(0xFFFDECEF), + Color.FromUInt32(0xFFFBCFD8), + Color.FromUInt32(0xFFF6A0B5), + Color.FromUInt32(0xFFF27396), + Color.FromUInt32(0xFFED487B), + Color.FromUInt32(0xFFE91E63), + Color.FromUInt32(0xFFC51356), + Color.FromUInt32(0xFFA20B48), + Color.FromUInt32(0xFF7E053A), + Color.FromUInt32(0xFF5A012B), + Color.FromUInt32(0xFFF7E9F7), + Color.FromUInt32(0xFFEFCAF0), + Color.FromUInt32(0xFFDD9BE0), + Color.FromUInt32(0xFFC96FD1), + Color.FromUInt32(0xFFB449C2), + Color.FromUInt32(0xFF9E28B3), + Color.FromUInt32(0xFF871E9E), + Color.FromUInt32(0xFF71168A), + Color.FromUInt32(0xFF5C0F75), + Color.FromUInt32(0xFF490A61), + Color.FromUInt32(0xFFF3EDF9), + Color.FromUInt32(0xFFE2D1F4), + Color.FromUInt32(0xFFC4A7E9), + Color.FromUInt32(0xFFA67FDD), + Color.FromUInt32(0xFF885BD2), + Color.FromUInt32(0xFF6A3AC7), + Color.FromUInt32(0xFF572FB3), + Color.FromUInt32(0xFF46259E), + Color.FromUInt32(0xFF361C8A), + Color.FromUInt32(0xFF281475), + Color.FromUInt32(0xFFECEFF8), + Color.FromUInt32(0xFFD1D8F0), + Color.FromUInt32(0xFFA7B3E1), + Color.FromUInt32(0xFF8090D3), + Color.FromUInt32(0xFF5E6FC4), + Color.FromUInt32(0xFF3F51B5), + Color.FromUInt32(0xFF3342A1), + Color.FromUInt32(0xFF28348C), + Color.FromUInt32(0xFF1F2878), + Color.FromUInt32(0xFF171D63), + Color.FromUInt32(0xFFEAF5FF), + Color.FromUInt32(0xFFCBE7FE), + Color.FromUInt32(0xFF98CDFD), + Color.FromUInt32(0xFF65B2FC), + Color.FromUInt32(0xFF3295FB), + Color.FromUInt32(0xFF0077FA), + Color.FromUInt32(0xFF0062D6), + Color.FromUInt32(0xFF004FB3), + Color.FromUInt32(0xFF003D8F), + Color.FromUInt32(0xFF002C6B), + Color.FromUInt32(0xFFE9F7FD), + Color.FromUInt32(0xFFC9ECFC), + Color.FromUInt32(0xFF95D8F8), + Color.FromUInt32(0xFF62C3F5), + Color.FromUInt32(0xFF30ACF1), + Color.FromUInt32(0xFF0095EE), + Color.FromUInt32(0xFF007BCA), + Color.FromUInt32(0xFF0063A7), + Color.FromUInt32(0xFF004B83), + Color.FromUInt32(0xFF00355F), + Color.FromUInt32(0xFFE5F7F8), + Color.FromUInt32(0xFFC2EFF0), + Color.FromUInt32(0xFF8ADDE2), + Color.FromUInt32(0xFF58CBD3), + Color.FromUInt32(0xFF2CB8C5), + Color.FromUInt32(0xFF05A4B6), + Color.FromUInt32(0xFF038698), + Color.FromUInt32(0xFF016979), + Color.FromUInt32(0xFF004D5B), + Color.FromUInt32(0xFF00323D), + Color.FromUInt32(0xFFE4F7F4), + Color.FromUInt32(0xFFC0F0E8), + Color.FromUInt32(0xFF87E0D3), + Color.FromUInt32(0xFF54D1C1), + Color.FromUInt32(0xFF27C2B0), + Color.FromUInt32(0xFF00B3A1), + Color.FromUInt32(0xFF009589), + Color.FromUInt32(0xFF00776F), + Color.FromUInt32(0xFF005955), + Color.FromUInt32(0xFF003C3A), + Color.FromUInt32(0xFFECF7EC), + Color.FromUInt32(0xFFD0F0D1), + Color.FromUInt32(0xFFA4E0A7), + Color.FromUInt32(0xFF7DD182), + Color.FromUInt32(0xFF5AC262), + Color.FromUInt32(0xFF3BB346), + Color.FromUInt32(0xFF30953B), + Color.FromUInt32(0xFF25772F), + Color.FromUInt32(0xFF1B5924), + Color.FromUInt32(0xFF113C18), + Color.FromUInt32(0xFFF3F8EC), + Color.FromUInt32(0xFFE3F0D0), + Color.FromUInt32(0xFFC8E2A5), + Color.FromUInt32(0xFFADD37E), + Color.FromUInt32(0xFF93C55B), + Color.FromUInt32(0xFF7BB63C), + Color.FromUInt32(0xFF649830), + Color.FromUInt32(0xFF4E7926), + Color.FromUInt32(0xFF395B1B), + Color.FromUInt32(0xFF253D12), + Color.FromUInt32(0xFFF2FAE6), + Color.FromUInt32(0xFFE3F6C5), + Color.FromUInt32(0xFFCBED8E), + Color.FromUInt32(0xFFB7E35B), + Color.FromUInt32(0xFFA7DA2C), + Color.FromUInt32(0xFF9BD100), + Color.FromUInt32(0xFF7EAE00), + Color.FromUInt32(0xFF638B00), + Color.FromUInt32(0xFF486800), + Color.FromUInt32(0xFF2F4600), + Color.FromUInt32(0xFFFFFDEA), + Color.FromUInt32(0xFFFEFBCB), + Color.FromUInt32(0xFFFDF398), + Color.FromUInt32(0xFFFCE865), + Color.FromUInt32(0xFFFBDA32), + Color.FromUInt32(0xFFFAC800), + Color.FromUInt32(0xFFD0AA00), + Color.FromUInt32(0xFFA78B00), + Color.FromUInt32(0xFF7D6A00), + Color.FromUInt32(0xFF534800), + Color.FromUInt32(0xFFFEFBEB), + Color.FromUInt32(0xFFFCF5CE), + Color.FromUInt32(0xFFF9E89E), + Color.FromUInt32(0xFFF6D86F), + Color.FromUInt32(0xFFF3C641), + Color.FromUInt32(0xFFF0B114), + Color.FromUInt32(0xFFC88A0F), + Color.FromUInt32(0xFFA0660A), + Color.FromUInt32(0xFF784606), + Color.FromUInt32(0xFF502B03), + Color.FromUInt32(0xFFFFF8EA), + Color.FromUInt32(0xFFFEEECC), + Color.FromUInt32(0xFFFED998), + Color.FromUInt32(0xFFFDC165), + Color.FromUInt32(0xFFFDA633), + Color.FromUInt32(0xFFFC8800), + Color.FromUInt32(0xFFD26700), + Color.FromUInt32(0xFFA84A00), + Color.FromUInt32(0xFF7E3100), + Color.FromUInt32(0xFF541D00), + Color.FromUInt32(0xFFF9F9F9), + Color.FromUInt32(0xFFE6E8EA), + Color.FromUInt32(0xFFC6CACD), + Color.FromUInt32(0xFFA7ABB0), + Color.FromUInt32(0xFF888D92), + Color.FromUInt32(0xFF6B7075), + Color.FromUInt32(0xFF555B61), + Color.FromUInt32(0xFF41464C), + Color.FromUInt32(0xFF2E3238), + Color.FromUInt32(0xFF1C1F23), } }; public Color GetColor(int colorIndex, int shadeIndex) From 0e76c09b8e9fa6c418a54db273acae309aa84aa0 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sun, 26 Mar 2023 22:04:23 +0800 Subject: [PATCH 08/10] feat: split colors. --- .../SemiColorDarkPalette.cs | 32 +++++++++++++++++++ .../SemiColorLightPalette.cs | 32 +++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs index e166600..0e58bb4 100644 --- a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs +++ b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs @@ -9,6 +9,7 @@ public class SemiColorDarkPalette: IColorPalette private static readonly Color[,] Colors = new Color[,] { { + //Red Color.FromUInt32(0xFF6C090B), Color.FromUInt32(0xFF901110), Color.FromUInt32(0xFFB42019), @@ -19,6 +20,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFDBEAC), Color.FromUInt32(0xFFFEE0D5), Color.FromUInt32(0xFFFFF3EF), + //Pink Color.FromUInt32(0xFF5C0730), Color.FromUInt32(0xFF800E41), Color.FromUInt32(0xFFA41751), @@ -29,6 +31,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFF7A8BC), Color.FromUInt32(0xFFFBD3DC), Color.FromUInt32(0xFFFDEEF1), + //Purple Color.FromUInt32(0xFF4A1061), Color.FromUInt32(0xFF5E1776), Color.FromUInt32(0xFF731F8A), @@ -39,6 +42,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFDDA0E1), Color.FromUInt32(0xFFEFCEF0), Color.FromUInt32(0xFFF7EBF7), + //Violet Color.FromUInt32(0xFF401B77), Color.FromUInt32(0xFF4C248C), Color.FromUInt32(0xFF582EA0), @@ -49,6 +53,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFBEADE9), Color.FromUInt32(0xFFDDD4F4), Color.FromUInt32(0xFFF1EEFA), + //Indigo Color.FromUInt32(0xFF171E65), Color.FromUInt32(0xFF20297A), Color.FromUInt32(0xFF29368E), @@ -59,6 +64,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA7B4E2), Color.FromUInt32(0xFFD1D8F1), Color.FromUInt32(0xFFEDEFF8), + //Blue Color.FromUInt32(0xFF053170), Color.FromUInt32(0xFF0A4694), Color.FromUInt32(0xFF135CB8), @@ -69,6 +75,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA9D7FF), Color.FromUInt32(0xFFD4ECFF), Color.FromUInt32(0xFFEFF8FF), + //LightBlue Color.FromUInt32(0xFF003761), Color.FromUInt32(0xFF004D85), Color.FromUInt32(0xFF0366A9), @@ -79,6 +86,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF9DDCF9), Color.FromUInt32(0xFFCEEEFC), Color.FromUInt32(0xFFEBF8FE), + //Cyan Color.FromUInt32(0xFF04343D), Color.FromUInt32(0xFF074F5C), Color.FromUInt32(0xFF0A6C7B), @@ -89,6 +97,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF91DFE3), Color.FromUInt32(0xFFC6EFF1), Color.FromUInt32(0xFFE7F7F8), + //Teal Color.FromUInt32(0xFF023C39), Color.FromUInt32(0xFF045A55), Color.FromUInt32(0xFF07776F), @@ -99,6 +108,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF8EE1D3), Color.FromUInt32(0xFFC4F0E8), Color.FromUInt32(0xFFE6F7F4), + //Green Color.FromUInt32(0xFF123C19), Color.FromUInt32(0xFF1C5A25), Color.FromUInt32(0xFF277731), @@ -109,6 +119,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA6E1A8), Color.FromUInt32(0xFFD0F0D1), Color.FromUInt32(0xFFECF7EC), + //LightGreen Color.FromUInt32(0xFF263D13), Color.FromUInt32(0xFF3B5C1D), Color.FromUInt32(0xFF517B28), @@ -119,6 +130,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFC9E3A7), Color.FromUInt32(0xFFE4F1D1), Color.FromUInt32(0xFFF3F8ED), + //Lime Color.FromUInt32(0xFF314603), Color.FromUInt32(0xFF4B6905), Color.FromUInt32(0xFF678D09), @@ -129,6 +141,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFCFED96), Color.FromUInt32(0xFFE5F6C9), Color.FromUInt32(0xFFF3FBE9), + //Yellow Color.FromUInt32(0xFF544903), Color.FromUInt32(0xFF7E6C06), Color.FromUInt32(0xFFA88E0A), @@ -139,6 +152,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFEF5A0), Color.FromUInt32(0xFFFEFBD0), Color.FromUInt32(0xFFFFFEEC), + //Amber Color.FromUInt32(0xFF512E09), Color.FromUInt32(0xFF794B0F), Color.FromUInt32(0xFFA16B16), @@ -149,6 +163,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFAEAA6), Color.FromUInt32(0xFFFCF6D2), Color.FromUInt32(0xFFFEFBED), + //Orange Color.FromUInt32(0xFF551F03), Color.FromUInt32(0xFF803506), Color.FromUInt32(0xFFAA500A), @@ -159,6 +174,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFFDDA1), Color.FromUInt32(0xFFFFEFD0), Color.FromUInt32(0xFFFFF9ED), + //Grey Color.FromUInt32(0xFF1C1F23), Color.FromUInt32(0xFF2E3238), Color.FromUInt32(0xFF41464C), @@ -171,6 +187,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFF9F9F9), }, { + //Red Color.FromUInt32(0xFF6C090B), Color.FromUInt32(0xFF901110), Color.FromUInt32(0xFFB42019), @@ -181,6 +198,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFDBEAC), Color.FromUInt32(0xFFFEE0D5), Color.FromUInt32(0xFFFFF3EF), + //Pink Color.FromUInt32(0xFF5C0730), Color.FromUInt32(0xFF800E41), Color.FromUInt32(0xFFA41751), @@ -191,6 +209,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFF7A8BC), Color.FromUInt32(0xFFFBD3DC), Color.FromUInt32(0xFFFDEEF1), + //Purple Color.FromUInt32(0xFF4A1061), Color.FromUInt32(0xFF5E1776), Color.FromUInt32(0xFF731F8A), @@ -201,6 +220,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFDDA0E1), Color.FromUInt32(0xFFEFCEF0), Color.FromUInt32(0xFFF7EBF7), + //Violet Color.FromUInt32(0xFF401B77), Color.FromUInt32(0xFF4C248C), Color.FromUInt32(0xFF582EA0), @@ -211,6 +231,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFBEADE9), Color.FromUInt32(0xFFDDD4F4), Color.FromUInt32(0xFFF1EEFA), + //Indigo Color.FromUInt32(0xFF171E65), Color.FromUInt32(0xFF20297A), Color.FromUInt32(0xFF29368E), @@ -221,6 +242,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA7B4E2), Color.FromUInt32(0xFFD1D8F1), Color.FromUInt32(0xFFEDEFF8), + //Blue Color.FromUInt32(0xFF053170), Color.FromUInt32(0xFF0A4694), Color.FromUInt32(0xFF135CB8), @@ -231,6 +253,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA9D7FF), Color.FromUInt32(0xFFD4ECFF), Color.FromUInt32(0xFFEFF8FF), + //LightBlue Color.FromUInt32(0xFF003761), Color.FromUInt32(0xFF004D85), Color.FromUInt32(0xFF0366A9), @@ -241,6 +264,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF9DDCF9), Color.FromUInt32(0xFFCEEEFC), Color.FromUInt32(0xFFEBF8FE), + //Cyan Color.FromUInt32(0xFF04343D), Color.FromUInt32(0xFF074F5C), Color.FromUInt32(0xFF0A6C7B), @@ -251,6 +275,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF91DFE3), Color.FromUInt32(0xFFC6EFF1), Color.FromUInt32(0xFFE7F7F8), + //Teal Color.FromUInt32(0xFF023C39), Color.FromUInt32(0xFF045A55), Color.FromUInt32(0xFF07776F), @@ -261,6 +286,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF8EE1D3), Color.FromUInt32(0xFFC4F0E8), Color.FromUInt32(0xFFE6F7F4), + //Green Color.FromUInt32(0xFF123C19), Color.FromUInt32(0xFF1C5A25), Color.FromUInt32(0xFF277731), @@ -271,6 +297,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA6E1A8), Color.FromUInt32(0xFFD0F0D1), Color.FromUInt32(0xFFECF7EC), + //LightGreen Color.FromUInt32(0xFF263D13), Color.FromUInt32(0xFF3B5C1D), Color.FromUInt32(0xFF517B28), @@ -281,6 +308,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFC9E3A7), Color.FromUInt32(0xFFE4F1D1), Color.FromUInt32(0xFFF3F8ED), + //Lime Color.FromUInt32(0xFF314603), Color.FromUInt32(0xFF4B6905), Color.FromUInt32(0xFF678D09), @@ -291,6 +319,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFCFED96), Color.FromUInt32(0xFFE5F6C9), Color.FromUInt32(0xFFF3FBE9), + //Yellow Color.FromUInt32(0xFF544903), Color.FromUInt32(0xFF7E6C06), Color.FromUInt32(0xFFA88E0A), @@ -301,6 +330,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFEF5A0), Color.FromUInt32(0xFFFEFBD0), Color.FromUInt32(0xFFFFFEEC), + //Amber Color.FromUInt32(0xFF512E09), Color.FromUInt32(0xFF794B0F), Color.FromUInt32(0xFFA16B16), @@ -311,6 +341,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFAEAA6), Color.FromUInt32(0xFFFCF6D2), Color.FromUInt32(0xFFFEFBED), + //Orange Color.FromUInt32(0xFF551F03), Color.FromUInt32(0xFF803506), Color.FromUInt32(0xFFAA500A), @@ -321,6 +352,7 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFFDDA1), Color.FromUInt32(0xFFFFEFD0), Color.FromUInt32(0xFFFFF9ED), + //Grey Color.FromUInt32(0xFF1C1F23), Color.FromUInt32(0xFF2E3238), Color.FromUInt32(0xFF41464C), diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs index 441988b..8c6fa0a 100644 --- a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs +++ b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs @@ -9,6 +9,7 @@ public class SemiColorLightPalette: IColorPalette private static readonly Color[,] Colors = new Color[,] { { + //Red Color.FromUInt32(0xFFFEF2ED), Color.FromUInt32(0xFFFEDDD2), Color.FromUInt32(0xFFFDB7A5), @@ -19,6 +20,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFB2140C), Color.FromUInt32(0xFF8E0805), Color.FromUInt32(0xFF6A0103), + //Pink Color.FromUInt32(0xFFFDECEF), Color.FromUInt32(0xFFFBCFD8), Color.FromUInt32(0xFFF6A0B5), @@ -29,6 +31,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA20B48), Color.FromUInt32(0xFF7E053A), Color.FromUInt32(0xFF5A012B), + //Purple Color.FromUInt32(0xFFF7E9F7), Color.FromUInt32(0xFFEFCAF0), Color.FromUInt32(0xFFDD9BE0), @@ -39,6 +42,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF71168A), Color.FromUInt32(0xFF5C0F75), Color.FromUInt32(0xFF490A61), + //Violet Color.FromUInt32(0xFFF3EDF9), Color.FromUInt32(0xFFE2D1F4), Color.FromUInt32(0xFFC4A7E9), @@ -49,6 +53,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF46259E), Color.FromUInt32(0xFF361C8A), Color.FromUInt32(0xFF281475), + //Indigo Color.FromUInt32(0xFFECEFF8), Color.FromUInt32(0xFFD1D8F0), Color.FromUInt32(0xFFA7B3E1), @@ -59,6 +64,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF28348C), Color.FromUInt32(0xFF1F2878), Color.FromUInt32(0xFF171D63), + //Blue Color.FromUInt32(0xFFEAF5FF), Color.FromUInt32(0xFFCBE7FE), Color.FromUInt32(0xFF98CDFD), @@ -69,6 +75,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF004FB3), Color.FromUInt32(0xFF003D8F), Color.FromUInt32(0xFF002C6B), + //LightBlue Color.FromUInt32(0xFFE9F7FD), Color.FromUInt32(0xFFC9ECFC), Color.FromUInt32(0xFF95D8F8), @@ -79,6 +86,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF0063A7), Color.FromUInt32(0xFF004B83), Color.FromUInt32(0xFF00355F), + //Cyan Color.FromUInt32(0xFFE5F7F8), Color.FromUInt32(0xFFC2EFF0), Color.FromUInt32(0xFF8ADDE2), @@ -89,6 +97,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF016979), Color.FromUInt32(0xFF004D5B), Color.FromUInt32(0xFF00323D), + //Teal Color.FromUInt32(0xFFE4F7F4), Color.FromUInt32(0xFFC0F0E8), Color.FromUInt32(0xFF87E0D3), @@ -99,6 +108,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF00776F), Color.FromUInt32(0xFF005955), Color.FromUInt32(0xFF003C3A), + //Green Color.FromUInt32(0xFFECF7EC), Color.FromUInt32(0xFFD0F0D1), Color.FromUInt32(0xFFA4E0A7), @@ -109,6 +119,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF25772F), Color.FromUInt32(0xFF1B5924), Color.FromUInt32(0xFF113C18), + //LightGreen Color.FromUInt32(0xFFF3F8EC), Color.FromUInt32(0xFFE3F0D0), Color.FromUInt32(0xFFC8E2A5), @@ -119,6 +130,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF4E7926), Color.FromUInt32(0xFF395B1B), Color.FromUInt32(0xFF253D12), + //Lime Color.FromUInt32(0xFFF2FAE6), Color.FromUInt32(0xFFE3F6C5), Color.FromUInt32(0xFFCBED8E), @@ -129,6 +141,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF638B00), Color.FromUInt32(0xFF486800), Color.FromUInt32(0xFF2F4600), + //Yellow Color.FromUInt32(0xFFFFFDEA), Color.FromUInt32(0xFFFEFBCB), Color.FromUInt32(0xFFFDF398), @@ -139,6 +152,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA78B00), Color.FromUInt32(0xFF7D6A00), Color.FromUInt32(0xFF534800), + //Amber Color.FromUInt32(0xFFFEFBEB), Color.FromUInt32(0xFFFCF5CE), Color.FromUInt32(0xFFF9E89E), @@ -149,6 +163,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA0660A), Color.FromUInt32(0xFF784606), Color.FromUInt32(0xFF502B03), + //Orange Color.FromUInt32(0xFFFFF8EA), Color.FromUInt32(0xFFFEEECC), Color.FromUInt32(0xFFFED998), @@ -159,6 +174,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA84A00), Color.FromUInt32(0xFF7E3100), Color.FromUInt32(0xFF541D00), + //Grey Color.FromUInt32(0xFFF9F9F9), Color.FromUInt32(0xFFE6E8EA), Color.FromUInt32(0xFFC6CACD), @@ -171,6 +187,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF1C1F23), }, { + //Red Color.FromUInt32(0xFFFEF2ED), Color.FromUInt32(0xFFFEDDD2), Color.FromUInt32(0xFFFDB7A5), @@ -181,6 +198,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFB2140C), Color.FromUInt32(0xFF8E0805), Color.FromUInt32(0xFF6A0103), + //Pink Color.FromUInt32(0xFFFDECEF), Color.FromUInt32(0xFFFBCFD8), Color.FromUInt32(0xFFF6A0B5), @@ -191,6 +209,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA20B48), Color.FromUInt32(0xFF7E053A), Color.FromUInt32(0xFF5A012B), + //Purple Color.FromUInt32(0xFFF7E9F7), Color.FromUInt32(0xFFEFCAF0), Color.FromUInt32(0xFFDD9BE0), @@ -201,6 +220,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF71168A), Color.FromUInt32(0xFF5C0F75), Color.FromUInt32(0xFF490A61), + //Violet Color.FromUInt32(0xFFF3EDF9), Color.FromUInt32(0xFFE2D1F4), Color.FromUInt32(0xFFC4A7E9), @@ -211,6 +231,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF46259E), Color.FromUInt32(0xFF361C8A), Color.FromUInt32(0xFF281475), + //Indigo Color.FromUInt32(0xFFECEFF8), Color.FromUInt32(0xFFD1D8F0), Color.FromUInt32(0xFFA7B3E1), @@ -221,6 +242,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF28348C), Color.FromUInt32(0xFF1F2878), Color.FromUInt32(0xFF171D63), + //Blue Color.FromUInt32(0xFFEAF5FF), Color.FromUInt32(0xFFCBE7FE), Color.FromUInt32(0xFF98CDFD), @@ -231,6 +253,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF004FB3), Color.FromUInt32(0xFF003D8F), Color.FromUInt32(0xFF002C6B), + //LightBlue Color.FromUInt32(0xFFE9F7FD), Color.FromUInt32(0xFFC9ECFC), Color.FromUInt32(0xFF95D8F8), @@ -241,6 +264,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF0063A7), Color.FromUInt32(0xFF004B83), Color.FromUInt32(0xFF00355F), + //Cyan Color.FromUInt32(0xFFE5F7F8), Color.FromUInt32(0xFFC2EFF0), Color.FromUInt32(0xFF8ADDE2), @@ -251,6 +275,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF016979), Color.FromUInt32(0xFF004D5B), Color.FromUInt32(0xFF00323D), + //Teal Color.FromUInt32(0xFFE4F7F4), Color.FromUInt32(0xFFC0F0E8), Color.FromUInt32(0xFF87E0D3), @@ -261,6 +286,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF00776F), Color.FromUInt32(0xFF005955), Color.FromUInt32(0xFF003C3A), + //Green Color.FromUInt32(0xFFECF7EC), Color.FromUInt32(0xFFD0F0D1), Color.FromUInt32(0xFFA4E0A7), @@ -271,6 +297,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF25772F), Color.FromUInt32(0xFF1B5924), Color.FromUInt32(0xFF113C18), + //LightGreen Color.FromUInt32(0xFFF3F8EC), Color.FromUInt32(0xFFE3F0D0), Color.FromUInt32(0xFFC8E2A5), @@ -281,6 +308,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF4E7926), Color.FromUInt32(0xFF395B1B), Color.FromUInt32(0xFF253D12), + //Lime Color.FromUInt32(0xFFF2FAE6), Color.FromUInt32(0xFFE3F6C5), Color.FromUInt32(0xFFCBED8E), @@ -291,6 +319,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF638B00), Color.FromUInt32(0xFF486800), Color.FromUInt32(0xFF2F4600), + //Yellow Color.FromUInt32(0xFFFFFDEA), Color.FromUInt32(0xFFFEFBCB), Color.FromUInt32(0xFFFDF398), @@ -301,6 +330,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA78B00), Color.FromUInt32(0xFF7D6A00), Color.FromUInt32(0xFF534800), + //Amber Color.FromUInt32(0xFFFEFBEB), Color.FromUInt32(0xFFFCF5CE), Color.FromUInt32(0xFFF9E89E), @@ -311,6 +341,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA0660A), Color.FromUInt32(0xFF784606), Color.FromUInt32(0xFF502B03), + //Orange Color.FromUInt32(0xFFFFF8EA), Color.FromUInt32(0xFFFEEECC), Color.FromUInt32(0xFFFED998), @@ -321,6 +352,7 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA84A00), Color.FromUInt32(0xFF7E3100), Color.FromUInt32(0xFF541D00), + //Grey Color.FromUInt32(0xFFF9F9F9), Color.FromUInt32(0xFFE6E8EA), Color.FromUInt32(0xFFC6CACD), From fd33972dda77b9b783791ed1ef79a129225c37c5 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Sun, 26 Mar 2023 22:13:31 +0800 Subject: [PATCH 09/10] feat: grouped as 2d array. --- .../SemiColorDarkPalette.cs | 208 +++--------------- .../SemiColorLightPalette.cs | 208 +++--------------- 2 files changed, 60 insertions(+), 356 deletions(-) diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs index 0e58bb4..6329ef5 100644 --- a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs +++ b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs @@ -20,6 +20,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFDBEAC), Color.FromUInt32(0xFFFEE0D5), Color.FromUInt32(0xFFFFF3EF), + }, + { //Pink Color.FromUInt32(0xFF5C0730), Color.FromUInt32(0xFF800E41), @@ -31,6 +33,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFF7A8BC), Color.FromUInt32(0xFFFBD3DC), Color.FromUInt32(0xFFFDEEF1), + }, + { //Purple Color.FromUInt32(0xFF4A1061), Color.FromUInt32(0xFF5E1776), @@ -42,6 +46,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFDDA0E1), Color.FromUInt32(0xFFEFCEF0), Color.FromUInt32(0xFFF7EBF7), + }, + { //Violet Color.FromUInt32(0xFF401B77), Color.FromUInt32(0xFF4C248C), @@ -53,6 +59,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFBEADE9), Color.FromUInt32(0xFFDDD4F4), Color.FromUInt32(0xFFF1EEFA), + }, + { //Indigo Color.FromUInt32(0xFF171E65), Color.FromUInt32(0xFF20297A), @@ -64,6 +72,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA7B4E2), Color.FromUInt32(0xFFD1D8F1), Color.FromUInt32(0xFFEDEFF8), + }, + { //Blue Color.FromUInt32(0xFF053170), Color.FromUInt32(0xFF0A4694), @@ -75,6 +85,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA9D7FF), Color.FromUInt32(0xFFD4ECFF), Color.FromUInt32(0xFFEFF8FF), + }, + { //LightBlue Color.FromUInt32(0xFF003761), Color.FromUInt32(0xFF004D85), @@ -86,6 +98,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF9DDCF9), Color.FromUInt32(0xFFCEEEFC), Color.FromUInt32(0xFFEBF8FE), + }, + { //Cyan Color.FromUInt32(0xFF04343D), Color.FromUInt32(0xFF074F5C), @@ -97,6 +111,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF91DFE3), Color.FromUInt32(0xFFC6EFF1), Color.FromUInt32(0xFFE7F7F8), + }, + { //Teal Color.FromUInt32(0xFF023C39), Color.FromUInt32(0xFF045A55), @@ -108,6 +124,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFF8EE1D3), Color.FromUInt32(0xFFC4F0E8), Color.FromUInt32(0xFFE6F7F4), + }, + { //Green Color.FromUInt32(0xFF123C19), Color.FromUInt32(0xFF1C5A25), @@ -119,6 +137,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFA6E1A8), Color.FromUInt32(0xFFD0F0D1), Color.FromUInt32(0xFFECF7EC), + }, + { //LightGreen Color.FromUInt32(0xFF263D13), Color.FromUInt32(0xFF3B5C1D), @@ -130,6 +150,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFC9E3A7), Color.FromUInt32(0xFFE4F1D1), Color.FromUInt32(0xFFF3F8ED), + }, + { //Lime Color.FromUInt32(0xFF314603), Color.FromUInt32(0xFF4B6905), @@ -141,6 +163,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFCFED96), Color.FromUInt32(0xFFE5F6C9), Color.FromUInt32(0xFFF3FBE9), + }, + { //Yellow Color.FromUInt32(0xFF544903), Color.FromUInt32(0xFF7E6C06), @@ -152,6 +176,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFEF5A0), Color.FromUInt32(0xFFFEFBD0), Color.FromUInt32(0xFFFFFEEC), + }, + { //Amber Color.FromUInt32(0xFF512E09), Color.FromUInt32(0xFF794B0F), @@ -163,6 +189,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFAEAA6), Color.FromUInt32(0xFFFCF6D2), Color.FromUInt32(0xFFFEFBED), + }, + { //Orange Color.FromUInt32(0xFF551F03), Color.FromUInt32(0xFF803506), @@ -174,6 +202,8 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFFFDDA1), Color.FromUInt32(0xFFFFEFD0), Color.FromUInt32(0xFFFFF9ED), + }, + { //Grey Color.FromUInt32(0xFF1C1F23), Color.FromUInt32(0xFF2E3238), @@ -186,184 +216,6 @@ public class SemiColorDarkPalette: IColorPalette Color.FromUInt32(0xFFE6E8EA), Color.FromUInt32(0xFFF9F9F9), }, - { - //Red - Color.FromUInt32(0xFF6C090B), - Color.FromUInt32(0xFF901110), - Color.FromUInt32(0xFFB42019), - Color.FromUInt32(0xFFD73324), - Color.FromUInt32(0xFFFB4932), - Color.FromUInt32(0xFFFC725A), - Color.FromUInt32(0xFFFD9983), - Color.FromUInt32(0xFFFDBEAC), - Color.FromUInt32(0xFFFEE0D5), - Color.FromUInt32(0xFFFFF3EF), - //Pink - Color.FromUInt32(0xFF5C0730), - Color.FromUInt32(0xFF800E41), - Color.FromUInt32(0xFFA41751), - Color.FromUInt32(0xFFC72261), - Color.FromUInt32(0xFFEB2F71), - Color.FromUInt32(0xFFEF5686), - Color.FromUInt32(0xFFF37E9F), - Color.FromUInt32(0xFFF7A8BC), - Color.FromUInt32(0xFFFBD3DC), - Color.FromUInt32(0xFFFDEEF1), - //Purple - Color.FromUInt32(0xFF4A1061), - Color.FromUInt32(0xFF5E1776), - Color.FromUInt32(0xFF731F8A), - Color.FromUInt32(0xFF89289F), - Color.FromUInt32(0xFFA033B3), - Color.FromUInt32(0xFFB553C2), - Color.FromUInt32(0xFFCA78D1), - Color.FromUInt32(0xFFDDA0E1), - Color.FromUInt32(0xFFEFCEF0), - Color.FromUInt32(0xFFF7EBF7), - //Violet - Color.FromUInt32(0xFF401B77), - Color.FromUInt32(0xFF4C248C), - Color.FromUInt32(0xFF582EA0), - Color.FromUInt32(0xFF6439B5), - Color.FromUInt32(0xFF7246C9), - Color.FromUInt32(0xFF8865D4), - Color.FromUInt32(0xFFA288DF), - Color.FromUInt32(0xFFBEADE9), - Color.FromUInt32(0xFFDDD4F4), - Color.FromUInt32(0xFFF1EEFA), - //Indigo - Color.FromUInt32(0xFF171E65), - Color.FromUInt32(0xFF20297A), - Color.FromUInt32(0xFF29368E), - Color.FromUInt32(0xFF3444A3), - Color.FromUInt32(0xFF4053B7), - Color.FromUInt32(0xFF5F71C5), - Color.FromUInt32(0xFF8191D4), - Color.FromUInt32(0xFFA7B4E2), - Color.FromUInt32(0xFFD1D8F1), - Color.FromUInt32(0xFFEDEFF8), - //Blue - Color.FromUInt32(0xFF053170), - Color.FromUInt32(0xFF0A4694), - Color.FromUInt32(0xFF135CB8), - Color.FromUInt32(0xFF1D75DB), - Color.FromUInt32(0xFF2990FF), - Color.FromUInt32(0xFF54A9FF), - Color.FromUInt32(0xFF7FC1FF), - Color.FromUInt32(0xFFA9D7FF), - Color.FromUInt32(0xFFD4ECFF), - Color.FromUInt32(0xFFEFF8FF), - //LightBlue - Color.FromUInt32(0xFF003761), - Color.FromUInt32(0xFF004D85), - Color.FromUInt32(0xFF0366A9), - Color.FromUInt32(0xFF0A81CC), - Color.FromUInt32(0xFF139FF0), - Color.FromUInt32(0xFF40B4F3), - Color.FromUInt32(0xFF6EC8F6), - Color.FromUInt32(0xFF9DDCF9), - Color.FromUInt32(0xFFCEEEFC), - Color.FromUInt32(0xFFEBF8FE), - //Cyan - Color.FromUInt32(0xFF04343D), - Color.FromUInt32(0xFF074F5C), - Color.FromUInt32(0xFF0A6C7B), - Color.FromUInt32(0xFF0E8999), - Color.FromUInt32(0xFF13A8B8), - Color.FromUInt32(0xFF38BBC6), - Color.FromUInt32(0xFF62CDD4), - Color.FromUInt32(0xFF91DFE3), - Color.FromUInt32(0xFFC6EFF1), - Color.FromUInt32(0xFFE7F7F8), - //Teal - Color.FromUInt32(0xFF023C39), - Color.FromUInt32(0xFF045A55), - Color.FromUInt32(0xFF07776F), - Color.FromUInt32(0xFF0A9588), - Color.FromUInt32(0xFF0EB3A1), - Color.FromUInt32(0xFF33C2B0), - Color.FromUInt32(0xFF5ED1C1), - Color.FromUInt32(0xFF8EE1D3), - Color.FromUInt32(0xFFC4F0E8), - Color.FromUInt32(0xFFE6F7F4), - //Green - Color.FromUInt32(0xFF123C19), - Color.FromUInt32(0xFF1C5A25), - Color.FromUInt32(0xFF277731), - Color.FromUInt32(0xFF32953D), - Color.FromUInt32(0xFF3EB349), - Color.FromUInt32(0xFF5DC264), - Color.FromUInt32(0xFF7FD184), - Color.FromUInt32(0xFFA6E1A8), - Color.FromUInt32(0xFFD0F0D1), - Color.FromUInt32(0xFFECF7EC), - //LightGreen - Color.FromUInt32(0xFF263D13), - Color.FromUInt32(0xFF3B5C1D), - Color.FromUInt32(0xFF517B28), - Color.FromUInt32(0xFF679934), - Color.FromUInt32(0xFF7FB840), - Color.FromUInt32(0xFF97C65F), - Color.FromUInt32(0xFFB0D481), - Color.FromUInt32(0xFFC9E3A7), - Color.FromUInt32(0xFFE4F1D1), - Color.FromUInt32(0xFFF3F8ED), - //Lime - Color.FromUInt32(0xFF314603), - Color.FromUInt32(0xFF4B6905), - Color.FromUInt32(0xFF678D09), - Color.FromUInt32(0xFF84B00C), - Color.FromUInt32(0xFFA2D311), - Color.FromUInt32(0xFFAEDC3A), - Color.FromUInt32(0xFFBDE566), - Color.FromUInt32(0xFFCFED96), - Color.FromUInt32(0xFFE5F6C9), - Color.FromUInt32(0xFFF3FBE9), - //Yellow - Color.FromUInt32(0xFF544903), - Color.FromUInt32(0xFF7E6C06), - Color.FromUInt32(0xFFA88E0A), - Color.FromUInt32(0xFFD2AF0F), - Color.FromUInt32(0xFFFCCE14), - Color.FromUInt32(0xFFFDDE43), - Color.FromUInt32(0xFFFDEB71), - Color.FromUInt32(0xFFFEF5A0), - Color.FromUInt32(0xFFFEFBD0), - Color.FromUInt32(0xFFFFFEEC), - //Amber - Color.FromUInt32(0xFF512E09), - Color.FromUInt32(0xFF794B0F), - Color.FromUInt32(0xFFA16B16), - Color.FromUInt32(0xFFCA8F1E), - Color.FromUInt32(0xFFF2B726), - Color.FromUInt32(0xFFF5CA50), - Color.FromUInt32(0xFFF7DB7A), - Color.FromUInt32(0xFFFAEAA6), - Color.FromUInt32(0xFFFCF6D2), - Color.FromUInt32(0xFFFEFBED), - //Orange - Color.FromUInt32(0xFF551F03), - Color.FromUInt32(0xFF803506), - Color.FromUInt32(0xFFAA500A), - Color.FromUInt32(0xFFD56F0F), - Color.FromUInt32(0xFFFF9214), - Color.FromUInt32(0xFFFFAE43), - Color.FromUInt32(0xFFFFC772), - Color.FromUInt32(0xFFFFDDA1), - Color.FromUInt32(0xFFFFEFD0), - Color.FromUInt32(0xFFFFF9ED), - //Grey - Color.FromUInt32(0xFF1C1F23), - Color.FromUInt32(0xFF2E3238), - Color.FromUInt32(0xFF41464C), - Color.FromUInt32(0xFF555B61), - Color.FromUInt32(0xFF6B7075), - Color.FromUInt32(0xFF888D92), - Color.FromUInt32(0xFFA7ABB0), - Color.FromUInt32(0xFFC6CACD), - Color.FromUInt32(0xFFE6E8EA), - Color.FromUInt32(0xFFF9F9F9), - } }; public Color GetColor(int colorIndex, int shadeIndex) { diff --git a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs index 8c6fa0a..fc9f842 100644 --- a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs +++ b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs @@ -20,6 +20,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFB2140C), Color.FromUInt32(0xFF8E0805), Color.FromUInt32(0xFF6A0103), + }, + { //Pink Color.FromUInt32(0xFFFDECEF), Color.FromUInt32(0xFFFBCFD8), @@ -31,6 +33,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA20B48), Color.FromUInt32(0xFF7E053A), Color.FromUInt32(0xFF5A012B), + }, + { //Purple Color.FromUInt32(0xFFF7E9F7), Color.FromUInt32(0xFFEFCAF0), @@ -42,6 +46,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF71168A), Color.FromUInt32(0xFF5C0F75), Color.FromUInt32(0xFF490A61), + }, + { //Violet Color.FromUInt32(0xFFF3EDF9), Color.FromUInt32(0xFFE2D1F4), @@ -53,6 +59,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF46259E), Color.FromUInt32(0xFF361C8A), Color.FromUInt32(0xFF281475), + }, + { //Indigo Color.FromUInt32(0xFFECEFF8), Color.FromUInt32(0xFFD1D8F0), @@ -64,6 +72,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF28348C), Color.FromUInt32(0xFF1F2878), Color.FromUInt32(0xFF171D63), + }, + { //Blue Color.FromUInt32(0xFFEAF5FF), Color.FromUInt32(0xFFCBE7FE), @@ -75,6 +85,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF004FB3), Color.FromUInt32(0xFF003D8F), Color.FromUInt32(0xFF002C6B), + }, + { //LightBlue Color.FromUInt32(0xFFE9F7FD), Color.FromUInt32(0xFFC9ECFC), @@ -86,6 +98,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF0063A7), Color.FromUInt32(0xFF004B83), Color.FromUInt32(0xFF00355F), + }, + { //Cyan Color.FromUInt32(0xFFE5F7F8), Color.FromUInt32(0xFFC2EFF0), @@ -97,6 +111,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF016979), Color.FromUInt32(0xFF004D5B), Color.FromUInt32(0xFF00323D), + }, + { //Teal Color.FromUInt32(0xFFE4F7F4), Color.FromUInt32(0xFFC0F0E8), @@ -108,6 +124,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF00776F), Color.FromUInt32(0xFF005955), Color.FromUInt32(0xFF003C3A), + }, + { //Green Color.FromUInt32(0xFFECF7EC), Color.FromUInt32(0xFFD0F0D1), @@ -119,6 +137,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF25772F), Color.FromUInt32(0xFF1B5924), Color.FromUInt32(0xFF113C18), + }, + { //LightGreen Color.FromUInt32(0xFFF3F8EC), Color.FromUInt32(0xFFE3F0D0), @@ -130,6 +150,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF4E7926), Color.FromUInt32(0xFF395B1B), Color.FromUInt32(0xFF253D12), + }, + { //Lime Color.FromUInt32(0xFFF2FAE6), Color.FromUInt32(0xFFE3F6C5), @@ -141,6 +163,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF638B00), Color.FromUInt32(0xFF486800), Color.FromUInt32(0xFF2F4600), + }, + { //Yellow Color.FromUInt32(0xFFFFFDEA), Color.FromUInt32(0xFFFEFBCB), @@ -152,6 +176,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA78B00), Color.FromUInt32(0xFF7D6A00), Color.FromUInt32(0xFF534800), + }, + { //Amber Color.FromUInt32(0xFFFEFBEB), Color.FromUInt32(0xFFFCF5CE), @@ -163,6 +189,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA0660A), Color.FromUInt32(0xFF784606), Color.FromUInt32(0xFF502B03), + }, + { //Orange Color.FromUInt32(0xFFFFF8EA), Color.FromUInt32(0xFFFEEECC), @@ -174,6 +202,8 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFFA84A00), Color.FromUInt32(0xFF7E3100), Color.FromUInt32(0xFF541D00), + }, + { //Grey Color.FromUInt32(0xFFF9F9F9), Color.FromUInt32(0xFFE6E8EA), @@ -186,184 +216,6 @@ public class SemiColorLightPalette: IColorPalette Color.FromUInt32(0xFF2E3238), Color.FromUInt32(0xFF1C1F23), }, - { - //Red - Color.FromUInt32(0xFFFEF2ED), - Color.FromUInt32(0xFFFEDDD2), - Color.FromUInt32(0xFFFDB7A5), - Color.FromUInt32(0xFFFB9078), - Color.FromUInt32(0xFFFA664C), - Color.FromUInt32(0xFFF93920), - Color.FromUInt32(0xFFD52515), - Color.FromUInt32(0xFFB2140C), - Color.FromUInt32(0xFF8E0805), - Color.FromUInt32(0xFF6A0103), - //Pink - Color.FromUInt32(0xFFFDECEF), - Color.FromUInt32(0xFFFBCFD8), - Color.FromUInt32(0xFFF6A0B5), - Color.FromUInt32(0xFFF27396), - Color.FromUInt32(0xFFED487B), - Color.FromUInt32(0xFFE91E63), - Color.FromUInt32(0xFFC51356), - Color.FromUInt32(0xFFA20B48), - Color.FromUInt32(0xFF7E053A), - Color.FromUInt32(0xFF5A012B), - //Purple - Color.FromUInt32(0xFFF7E9F7), - Color.FromUInt32(0xFFEFCAF0), - Color.FromUInt32(0xFFDD9BE0), - Color.FromUInt32(0xFFC96FD1), - Color.FromUInt32(0xFFB449C2), - Color.FromUInt32(0xFF9E28B3), - Color.FromUInt32(0xFF871E9E), - Color.FromUInt32(0xFF71168A), - Color.FromUInt32(0xFF5C0F75), - Color.FromUInt32(0xFF490A61), - //Violet - Color.FromUInt32(0xFFF3EDF9), - Color.FromUInt32(0xFFE2D1F4), - Color.FromUInt32(0xFFC4A7E9), - Color.FromUInt32(0xFFA67FDD), - Color.FromUInt32(0xFF885BD2), - Color.FromUInt32(0xFF6A3AC7), - Color.FromUInt32(0xFF572FB3), - Color.FromUInt32(0xFF46259E), - Color.FromUInt32(0xFF361C8A), - Color.FromUInt32(0xFF281475), - //Indigo - Color.FromUInt32(0xFFECEFF8), - Color.FromUInt32(0xFFD1D8F0), - Color.FromUInt32(0xFFA7B3E1), - Color.FromUInt32(0xFF8090D3), - Color.FromUInt32(0xFF5E6FC4), - Color.FromUInt32(0xFF3F51B5), - Color.FromUInt32(0xFF3342A1), - Color.FromUInt32(0xFF28348C), - Color.FromUInt32(0xFF1F2878), - Color.FromUInt32(0xFF171D63), - //Blue - Color.FromUInt32(0xFFEAF5FF), - Color.FromUInt32(0xFFCBE7FE), - Color.FromUInt32(0xFF98CDFD), - Color.FromUInt32(0xFF65B2FC), - Color.FromUInt32(0xFF3295FB), - Color.FromUInt32(0xFF0077FA), - Color.FromUInt32(0xFF0062D6), - Color.FromUInt32(0xFF004FB3), - Color.FromUInt32(0xFF003D8F), - Color.FromUInt32(0xFF002C6B), - //LightBlue - Color.FromUInt32(0xFFE9F7FD), - Color.FromUInt32(0xFFC9ECFC), - Color.FromUInt32(0xFF95D8F8), - Color.FromUInt32(0xFF62C3F5), - Color.FromUInt32(0xFF30ACF1), - Color.FromUInt32(0xFF0095EE), - Color.FromUInt32(0xFF007BCA), - Color.FromUInt32(0xFF0063A7), - Color.FromUInt32(0xFF004B83), - Color.FromUInt32(0xFF00355F), - //Cyan - Color.FromUInt32(0xFFE5F7F8), - Color.FromUInt32(0xFFC2EFF0), - Color.FromUInt32(0xFF8ADDE2), - Color.FromUInt32(0xFF58CBD3), - Color.FromUInt32(0xFF2CB8C5), - Color.FromUInt32(0xFF05A4B6), - Color.FromUInt32(0xFF038698), - Color.FromUInt32(0xFF016979), - Color.FromUInt32(0xFF004D5B), - Color.FromUInt32(0xFF00323D), - //Teal - Color.FromUInt32(0xFFE4F7F4), - Color.FromUInt32(0xFFC0F0E8), - Color.FromUInt32(0xFF87E0D3), - Color.FromUInt32(0xFF54D1C1), - Color.FromUInt32(0xFF27C2B0), - Color.FromUInt32(0xFF00B3A1), - Color.FromUInt32(0xFF009589), - Color.FromUInt32(0xFF00776F), - Color.FromUInt32(0xFF005955), - Color.FromUInt32(0xFF003C3A), - //Green - Color.FromUInt32(0xFFECF7EC), - Color.FromUInt32(0xFFD0F0D1), - Color.FromUInt32(0xFFA4E0A7), - Color.FromUInt32(0xFF7DD182), - Color.FromUInt32(0xFF5AC262), - Color.FromUInt32(0xFF3BB346), - Color.FromUInt32(0xFF30953B), - Color.FromUInt32(0xFF25772F), - Color.FromUInt32(0xFF1B5924), - Color.FromUInt32(0xFF113C18), - //LightGreen - Color.FromUInt32(0xFFF3F8EC), - Color.FromUInt32(0xFFE3F0D0), - Color.FromUInt32(0xFFC8E2A5), - Color.FromUInt32(0xFFADD37E), - Color.FromUInt32(0xFF93C55B), - Color.FromUInt32(0xFF7BB63C), - Color.FromUInt32(0xFF649830), - Color.FromUInt32(0xFF4E7926), - Color.FromUInt32(0xFF395B1B), - Color.FromUInt32(0xFF253D12), - //Lime - Color.FromUInt32(0xFFF2FAE6), - Color.FromUInt32(0xFFE3F6C5), - Color.FromUInt32(0xFFCBED8E), - Color.FromUInt32(0xFFB7E35B), - Color.FromUInt32(0xFFA7DA2C), - Color.FromUInt32(0xFF9BD100), - Color.FromUInt32(0xFF7EAE00), - Color.FromUInt32(0xFF638B00), - Color.FromUInt32(0xFF486800), - Color.FromUInt32(0xFF2F4600), - //Yellow - Color.FromUInt32(0xFFFFFDEA), - Color.FromUInt32(0xFFFEFBCB), - Color.FromUInt32(0xFFFDF398), - Color.FromUInt32(0xFFFCE865), - Color.FromUInt32(0xFFFBDA32), - Color.FromUInt32(0xFFFAC800), - Color.FromUInt32(0xFFD0AA00), - Color.FromUInt32(0xFFA78B00), - Color.FromUInt32(0xFF7D6A00), - Color.FromUInt32(0xFF534800), - //Amber - Color.FromUInt32(0xFFFEFBEB), - Color.FromUInt32(0xFFFCF5CE), - Color.FromUInt32(0xFFF9E89E), - Color.FromUInt32(0xFFF6D86F), - Color.FromUInt32(0xFFF3C641), - Color.FromUInt32(0xFFF0B114), - Color.FromUInt32(0xFFC88A0F), - Color.FromUInt32(0xFFA0660A), - Color.FromUInt32(0xFF784606), - Color.FromUInt32(0xFF502B03), - //Orange - Color.FromUInt32(0xFFFFF8EA), - Color.FromUInt32(0xFFFEEECC), - Color.FromUInt32(0xFFFED998), - Color.FromUInt32(0xFFFDC165), - Color.FromUInt32(0xFFFDA633), - Color.FromUInt32(0xFFFC8800), - Color.FromUInt32(0xFFD26700), - Color.FromUInt32(0xFFA84A00), - Color.FromUInt32(0xFF7E3100), - Color.FromUInt32(0xFF541D00), - //Grey - Color.FromUInt32(0xFFF9F9F9), - Color.FromUInt32(0xFFE6E8EA), - Color.FromUInt32(0xFFC6CACD), - Color.FromUInt32(0xFFA7ABB0), - Color.FromUInt32(0xFF888D92), - Color.FromUInt32(0xFF6B7075), - Color.FromUInt32(0xFF555B61), - Color.FromUInt32(0xFF41464C), - Color.FromUInt32(0xFF2E3238), - Color.FromUInt32(0xFF1C1F23), - } }; public Color GetColor(int colorIndex, int shadeIndex) { From e6531d89eb41882b264dbcf0c754813902c91d13 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Mon, 27 Mar 2023 11:25:47 +0800 Subject: [PATCH 10/10] feat: add color resource copy. --- .../Controls/ColorDetailControl.axaml | 42 ++++++++++++++----- .../Controls/ColorDetailControl.cs | 14 +++++++ .../Pages/PaletteDemo.axaml | 1 + .../ViewModels/PaletteDemoViewModel.cs | 9 ++++ 4 files changed, 55 insertions(+), 11 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml index 85c05e3..c65eb63 100644 --- a/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml +++ b/demo/Semi.Avalonia.Demo/Controls/ColorDetailControl.axaml @@ -21,8 +21,8 @@ HorizontalAlignment="Stretch" Background="{TemplateBinding Background}" CornerRadius="6" /> - - + + - - - + + + + - +