From d1d235a1200b589b3dec7e1cf2c7adbf465adc85 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 15 Nov 2024 01:00:59 +0800 Subject: [PATCH] misc: format codes. --- .../Controls/FunctionalColorGroupControl.cs | 27 ++- .../ViewModels/PaletteDemoViewModel.cs | 218 +++++++++--------- 2 files changed, 129 insertions(+), 116 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs index 7a17dee..57b3587 100644 --- a/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs +++ b/demo/Semi.Avalonia.Demo/Controls/FunctionalColorGroupControl.cs @@ -4,33 +4,38 @@ using Avalonia.Controls.Primitives; namespace Semi.Avalonia.Demo.Controls; -public class FunctionalColorGroupControl: TemplatedControl +public class FunctionalColorGroupControl : TemplatedControl { - public static readonly StyledProperty TitleProperty = AvaloniaProperty.Register( - nameof(Title)); + public static readonly StyledProperty TitleProperty = + AvaloniaProperty.Register(nameof(Title)); + public string? Title { get => GetValue(TitleProperty); set => SetValue(TitleProperty, value); } - - public static readonly DirectProperty LightColorsProperty = AvaloniaProperty.RegisterDirect( - nameof(LightColors), o => o.LightColors, (o, v) => o.LightColors = v); + + public static readonly DirectProperty LightColorsProperty = + AvaloniaProperty.RegisterDirect(nameof(LightColors), + o => o.LightColors, (o, v) => o.LightColors = v); + private IEnumerable? _lightColors; + public IEnumerable? LightColors { get => _lightColors; set => SetAndRaise(LightColorsProperty, ref _lightColors, value); } - - public static readonly DirectProperty DarkColorsProperty = AvaloniaProperty.RegisterDirect( - nameof(DarkColors), o => o.DarkColors, (o, v) => o.DarkColors = v); + + public static readonly DirectProperty DarkColorsProperty = + AvaloniaProperty.RegisterDirect(nameof(DarkColors), + o => o.DarkColors, (o, v) => o.DarkColors = v); + private IEnumerable? _darkColors; + public IEnumerable? DarkColors { get => _darkColors; set => SetAndRaise(DarkColorsProperty, ref _darkColors, value); } - - } \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs index 1646be8..4a53cb7 100644 --- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs +++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs @@ -2,25 +2,25 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using Avalonia.Controls; -using Avalonia.Markup.Xaml; using Avalonia.Media; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Messaging; namespace Semi.Avalonia.Demo.ViewModels; -public class PaletteDemoViewModel: ObservableObject +public class PaletteDemoViewModel : ObservableObject { 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; - + private ColorItemViewModel _selectedColor = null!; public ColorItemViewModel SelectedColor @@ -28,26 +28,29 @@ public class PaletteDemoViewModel: ObservableObject get => _selectedColor; set => SetProperty(ref _selectedColor, value); } - - + + private ObservableCollection? _lightLists; + public ObservableCollection? LightLists { get => _lightLists; set => SetProperty(ref _lightLists, value); } + private ObservableCollection? _darkLists; + public ObservableCollection? DarkLists { get => _darkLists; set => SetProperty(ref _darkLists, value); } - public ObservableCollection FunctionalColors { get; set; } = new(); + public ObservableCollection FunctionalColors { get; set; } = []; public PaletteDemoViewModel() { - _lightResourceDictionary = new Light.Palette(); + _lightResourceDictionary = new Light.Palette(); _darkResourceDictionary = new Dark.Palette(); WeakReferenceMessenger.Default.Register(this, OnClickColorItem); } @@ -60,14 +63,15 @@ public class PaletteDemoViewModel: ObservableObject private void InitializePalette() { - LightLists = new ObservableCollection(); + LightLists = []; foreach (var color in _predefinedColorNames) { ColorListViewModel s = new ColorListViewModel(); s.Initialize(_lightResourceDictionary, color, true); LightLists.Add(s); } - DarkLists = new ObservableCollection(); + + DarkLists = []; foreach (var color in _predefinedColorNames) { ColorListViewModel s = new ColorListViewModel(); @@ -92,13 +96,14 @@ public class PaletteDemoViewModel: ObservableObject FunctionalColors.Add(new FunctionalColorGroupViewModel("Border", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.BorderTokens)); FunctionalColors.Add(new FunctionalColorGroupViewModel("Disabled", _lightResourceDictionary, _darkResourceDictionary, ColorTokens.DisabledTokens)); } + private void OnClickColorItem(PaletteDemoViewModel vm, ColorItemViewModel item) { SelectedColor = item; } } -public class ColorListViewModel: ObservableObject +public class ColorListViewModel : ObservableObject { private ObservableCollection? _colors; @@ -115,17 +120,18 @@ public class ColorListViewModel: ObservableObject get => _seriesName; set => SetProperty(ref _seriesName, value); } - + internal void Initialize(IResourceDictionary? resourceDictionary, string color, bool light) { if (resourceDictionary is null) { return; } + SeriesName = color; - Color = new ObservableCollection(); - - for (int i = 0; i < 10; i++) + Color = []; + + for (var i = 0; i < 10; i++) { var key = "Semi" + color + i; if (resourceDictionary.TryGetValue(key, out var value)) @@ -136,7 +142,7 @@ public class ColorListViewModel: ObservableObject var item = new ColorItemViewModel(name, brush, key, light, i); item.ColorResourceKey = item.ResourceKey + "Color"; Color.Add(item); - } + } } } } @@ -144,15 +150,16 @@ public class ColorListViewModel: ObservableObject public class ColorItemViewModel : ObservableObject { - private IBrush _brush = null!; + public IBrush Brush { get => _brush; set => SetProperty(ref _brush, value); } - + private IBrush _textBrush = null!; + public IBrush TextBrush { get => _textBrush; @@ -160,6 +167,7 @@ public class ColorItemViewModel : ObservableObject } private string _colorDisplayName = null!; + public string ColorDisplayName { get => _colorDisplayName; @@ -189,8 +197,9 @@ public class ColorItemViewModel : ObservableObject get => _hex; set => SetProperty(ref _hex, value); } - - public ColorItemViewModel(string colorDisplayName, ISolidColorBrush brush, string resourceKey, bool light, int index) + + public ColorItemViewModel(string colorDisplayName, ISolidColorBrush brush, string resourceKey, bool light, + int index) { ColorDisplayName = colorDisplayName; Brush = brush; @@ -210,22 +219,22 @@ public class ColorItemViewModel : ObservableObject public class FunctionalColorGroupViewModel : ObservableObject { private string _title = null!; + public string Title { get => _title; set => SetProperty(ref _title, value); } - public ObservableCollection LightColors { get; set; } = new(); - public ObservableCollection DarkColors { get; set; } = new(); + public ObservableCollection LightColors { get; set; } = []; + public ObservableCollection DarkColors { get; set; } = []; - 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) + foreach (var (key, name) in tokens) { - string key = token.Item1; - string name = token.Item2; if (lightDictionary?.TryGetValue(key, out var lightValue) ?? false) { if (lightValue is ISolidColorBrush lightBrush) @@ -249,121 +258,120 @@ public static class ColorTokens { public static IReadOnlyList> PrimaryTokens { get; } = new List> { - new ("SemiColorPrimary", "Primary"), - new ("SemiColorPrimaryPointerover", "Primary Pointerover"), - new ("SemiColorPrimaryActive", "Primary Active"), - new ("SemiColorPrimaryDisabled", "Primary Disabled"), - new ("SemiColorPrimaryLight", "Primary Light"), - new ("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"), - new ("SemiColorPrimaryLightActive", "Primary Light Active"), + new("SemiColorPrimary", "Primary"), + new("SemiColorPrimaryPointerover", "Primary Pointerover"), + new("SemiColorPrimaryActive", "Primary Active"), + new("SemiColorPrimaryDisabled", "Primary Disabled"), + new("SemiColorPrimaryLight", "Primary Light"), + new("SemiColorPrimaryLightPointerover", "Primary Light Pointerover"), + new("SemiColorPrimaryLightActive", "Primary Light Active"), }; public static IReadOnlyList> SecondaryTokens { get; } = new List> { - new ("SemiColorSecondary", "Secondary"), - new ("SemiColorSecondaryPointerover", "Secondary Pointerover"), - new ("SemiColorSecondaryActive", "Secondary Active"), - new ("SemiColorSecondaryDisabled", "Secondary Disabled"), - new ("SemiColorSecondaryLight", "Secondary Light"), - new ("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"), - new ("SemiColorSecondaryLightActive", "Secondary Light Active"), + new("SemiColorSecondary", "Secondary"), + new("SemiColorSecondaryPointerover", "Secondary Pointerover"), + new("SemiColorSecondaryActive", "Secondary Active"), + new("SemiColorSecondaryDisabled", "Secondary Disabled"), + new("SemiColorSecondaryLight", "Secondary Light"), + new("SemiColorSecondaryLightPointerover", "Secondary Light Pointerover"), + new("SemiColorSecondaryLightActive", "Secondary Light Active"), }; - + public static IReadOnlyList> TertiaryTokens { get; } = new List> { - new ("SemiColorTertiary", "Tertiary"), - new ("SemiColorTertiaryPointerover", "Tertiary Pointerover"), - new ("SemiColorTertiaryActive", "Tertiary Active"), - new ("SemiColorTertiaryLight", "Tertiary Light"), - new ("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"), - new ("SemiColorTertiaryLightActive", "Tertiary Light Active"), + new("SemiColorTertiary", "Tertiary"), + new("SemiColorTertiaryPointerover", "Tertiary Pointerover"), + new("SemiColorTertiaryActive", "Tertiary Active"), + new("SemiColorTertiaryLight", "Tertiary Light"), + new("SemiColorTertiaryLightPointerover", "Tertiary Light Pointerover"), + new("SemiColorTertiaryLightActive", "Tertiary Light Active"), }; - + public static IReadOnlyList> InformationTokens { get; } = new List> { - new ("SemiColorInformation", "Information"), - new ("SemiColorInformationPointerover", "Information Pointerover"), - new ("SemiColorInformationActive", "Information Active"), - new ("SemiColorInformationDisabled", "Information Disabled"), - new ("SemiColorInformationLight", "Information Light"), - new ("SemiColorInformationLightPointerover", "Information Light Pointerover"), - new ("SemiColorInformationLightActive", "Information Light Active"), + new("SemiColorInformation", "Information"), + new("SemiColorInformationPointerover", "Information Pointerover"), + new("SemiColorInformationActive", "Information Active"), + new("SemiColorInformationDisabled", "Information Disabled"), + new("SemiColorInformationLight", "Information Light"), + new("SemiColorInformationLightPointerover", "Information Light Pointerover"), + new("SemiColorInformationLightActive", "Information Light Active"), }; - + public static IReadOnlyList> SuccessTokens { get; } = new List> { - new ("SemiColorSuccess", "Success"), - new ("SemiColorSuccessPointerover", "Success Pointerover"), - new ("SemiColorSuccessActive", "Success Active"), - new ("SemiColorSuccessDisabled", "Success Disabled"), - new ("SemiColorSuccessLight", "Success Light"), - new ("SemiColorSuccessLightPointerover", "Success Light Pointerover"), - new ("SemiColorSuccessLightActive", "Success Light Active"), + new("SemiColorSuccess", "Success"), + new("SemiColorSuccessPointerover", "Success Pointerover"), + new("SemiColorSuccessActive", "Success Active"), + new("SemiColorSuccessDisabled", "Success Disabled"), + new("SemiColorSuccessLight", "Success Light"), + new("SemiColorSuccessLightPointerover", "Success Light Pointerover"), + new("SemiColorSuccessLightActive", "Success Light Active"), }; - + public static IReadOnlyList> WarningTokens { get; } = new List> { - new ("SemiColorWarning", "Warning"), - new ("SemiColorWarningPointerover", "Warning Pointerover"), - new ("SemiColorWarningActive", "Warning Active"), - new ("SemiColorWarningLight", "Warning Light"), - new ("SemiColorWarningLightPointerover", "Warning Light Pointerover"), - new ("SemiColorWarningLightActive", "Warning Light Active"), + new("SemiColorWarning", "Warning"), + new("SemiColorWarningPointerover", "Warning Pointerover"), + new("SemiColorWarningActive", "Warning Active"), + new("SemiColorWarningLight", "Warning Light"), + new("SemiColorWarningLightPointerover", "Warning Light Pointerover"), + new("SemiColorWarningLightActive", "Warning Light Active"), }; - + public static IReadOnlyList> DangerTokens { get; } = new List> { - new ("SemiColorDanger", "Danger"), - new ("SemiColorDangerPointerover", "Danger Pointerover"), - new ("SemiColorDangerActive", "Danger Active"), - new ("SemiColorDangerLight", "Danger Light"), - new ("SemiColorDangerLightPointerover", "Danger Light Pointerover"), - new ("SemiColorDangerLightActive", "Danger Light Active"), + new("SemiColorDanger", "Danger"), + new("SemiColorDangerPointerover", "Danger Pointerover"), + new("SemiColorDangerActive", "Danger Active"), + new("SemiColorDangerLight", "Danger Light"), + new("SemiColorDangerLightPointerover", "Danger Light Pointerover"), + new("SemiColorDangerLightActive", "Danger Light Active"), }; public static IReadOnlyList> TextTokens { get; } = new List> { - new ("SemiColorText0", "Text 0"), - new ("SemiColorText1", "Text 1"), - new ("SemiColorText2", "Text 2"), - new ("SemiColorText3", "Text 3"), + new("SemiColorText0", "Text 0"), + new("SemiColorText1", "Text 1"), + new("SemiColorText2", "Text 2"), + new("SemiColorText3", "Text 3"), }; - + public static IReadOnlyList> LinkTokens { get; } = new List> { - new ("SemiColorLink", "Link"), - new ("SemiColorLinkPointerover", "Link Pointerover"), - new ("SemiColorLinkActive", "Link Active"), - new ("SemiColorLinkVisited", "Link Visited"), + new("SemiColorLink", "Link"), + new("SemiColorLinkPointerover", "Link Pointerover"), + new("SemiColorLinkActive", "Link Active"), + new("SemiColorLinkVisited", "Link Visited"), }; - + public static IReadOnlyList> BackgroundTokens { get; } = new List> { - new ("SemiColorBackground0", "Background 0"), - new ("SemiColorBackground1", "Background 1"), - new ("SemiColorBackground2", "Background 2"), - new ("SemiColorBackground3", "Background 3"), - new ("SemiColorBackground4", "Background 4"), + new("SemiColorBackground0", "Background 0"), + new("SemiColorBackground1", "Background 1"), + new("SemiColorBackground2", "Background 2"), + new("SemiColorBackground3", "Background 3"), + new("SemiColorBackground4", "Background 4"), }; - + public static IReadOnlyList> FillTokens { get; } = new List> { - new ("SemiColorFill0", "Fill 0"), - new ("SemiColorFill1", "Fill 1"), - new ("SemiColorFill2", "Fill 2"), + new("SemiColorFill0", "Fill 0"), + new("SemiColorFill1", "Fill 1"), + new("SemiColorFill2", "Fill 2"), }; - + public static IReadOnlyList> BorderTokens { get; } = new List> { - new ("SemiColorBorder", "Border"), + new("SemiColorBorder", "Border"), }; - + public static IReadOnlyList> DisabledTokens { get; } = new List> { - new ("SemiColorDisabledText", "Disabled Text"), - new ("SemiColorDisabledBorder", "Disabled Border"), - new ("SemiColorDisabledBackground", "Disabled Background"), - new ("SemiColorDisabledFill", "Disabled Fill"), + new("SemiColorDisabledText", "Disabled Text"), + new("SemiColorDisabledBorder", "Disabled Border"), + new("SemiColorDisabledBackground", "Disabled Background"), + new("SemiColorDisabledFill", "Disabled Fill"), }; - } \ No newline at end of file