From cefa6bb4df46d69432ef66d7f577c74656a6f96a Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Wed, 10 May 2023 23:50:01 +0800 Subject: [PATCH 01/15] feat: Add a theme for HeaderedContentControl as GroupBox. --- .../Pages/HeaderedContentControlDemo.axaml | 12 +++++ .../Pages/HeaderedContentControlDemo.axaml.cs | 11 +++++ demo/Semi.Avalonia.Demo/Views/MainView.axaml | 3 ++ src/Semi.Avalonia/Controls/Controls.axaml | 1 + .../Controls/HeaderedContentControl.axaml | 48 +++++++++++++++++++ src/Semi.Avalonia/Themes/Dark/Dark.axaml | 1 + .../Themes/Dark/HeaderedContentControl.axaml | 5 ++ .../Themes/Light/HeaderedContentControl.axaml | 5 ++ src/Semi.Avalonia/Themes/Light/Light.axaml | 1 + 9 files changed, 87 insertions(+) create mode 100644 demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml create mode 100644 demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml.cs create mode 100644 src/Semi.Avalonia/Controls/HeaderedContentControl.axaml create mode 100644 src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml create mode 100644 src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml diff --git a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml new file mode 100644 index 0000000..cfcf65e --- /dev/null +++ b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml @@ -0,0 +1,12 @@ + + + + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。 + + + \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml.cs new file mode 100644 index 0000000..fa951c1 --- /dev/null +++ b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml.cs @@ -0,0 +1,11 @@ +using Avalonia.Controls; + +namespace Semi.Avalonia.Demo.Pages; + +public partial class HeaderedContentControlDemo : UserControl +{ + public HeaderedContentControlDemo() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml index 39aa54d..13b37f7 100644 --- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml +++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml @@ -123,6 +123,9 @@ + + + diff --git a/src/Semi.Avalonia/Controls/Controls.axaml b/src/Semi.Avalonia/Controls/Controls.axaml index 1674a64..7933d64 100644 --- a/src/Semi.Avalonia/Controls/Controls.axaml +++ b/src/Semi.Avalonia/Controls/Controls.axaml @@ -24,6 +24,7 @@ + diff --git a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml new file mode 100644 index 0000000..68388f2 --- /dev/null +++ b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/Dark.axaml b/src/Semi.Avalonia/Themes/Dark/Dark.axaml index b588cdd..03fb808 100644 --- a/src/Semi.Avalonia/Themes/Dark/Dark.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Dark.axaml @@ -19,6 +19,7 @@ + diff --git a/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml new file mode 100644 index 0000000..2fe0254 --- /dev/null +++ b/src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml new file mode 100644 index 0000000..891a7ad --- /dev/null +++ b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/Light.axaml index 2116c6b..3eb48db 100644 --- a/src/Semi.Avalonia/Themes/Light/Light.axaml +++ b/src/Semi.Avalonia/Themes/Light/Light.axaml @@ -18,6 +18,7 @@ + From f29e60712b5a81828a4125d04707e7e587ffdf20 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Wed, 10 May 2023 23:59:47 +0800 Subject: [PATCH 02/15] feat: specify CornerRadius. --- src/Semi.Avalonia/Controls/HeaderedContentControl.axaml | 3 ++- src/Semi.Avalonia/Themes/Dark/HeaderedContentControl.axaml | 1 + src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml index 68388f2..0a1a15e 100644 --- a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml +++ b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml @@ -6,7 +6,7 @@ - + @@ -21,6 +21,7 @@ Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" + CornerRadius="{TemplateBinding CornerRadius}" BorderThickness="{TemplateBinding BorderThickness}"> + 4 \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml index 891a7ad..8c35c3d 100644 --- a/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml +++ b/src/Semi.Avalonia/Themes/Light/HeaderedContentControl.axaml @@ -2,4 +2,5 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + 4 \ No newline at end of file From 5475ad8bcf338ecc376bf94e5acd6d67fe43277c Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 11 May 2023 00:07:18 +0800 Subject: [PATCH 03/15] feat: rename theme key. --- demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml | 2 +- src/Semi.Avalonia/Controls/HeaderedContentControl.axaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml index cfcf65e..dbdabf7 100644 --- a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml @@ -5,7 +5,7 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo"> - + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。 diff --git a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml index 0a1a15e..918dc26 100644 --- a/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml +++ b/src/Semi.Avalonia/Controls/HeaderedContentControl.axaml @@ -2,7 +2,7 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:CompileBindings="True"> - + From 5d8297a392d1ccd2d621f48d39c67fd9d28d9cba Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 26 May 2023 15:58:37 +0800 Subject: [PATCH 04/15] fix: fix missing template. --- src/Semi.Avalonia/Controls/TreeView.axaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Semi.Avalonia/Controls/TreeView.axaml b/src/Semi.Avalonia/Controls/TreeView.axaml index 863244f..4904225 100644 --- a/src/Semi.Avalonia/Controls/TreeView.axaml +++ b/src/Semi.Avalonia/Controls/TreeView.axaml @@ -131,6 +131,7 @@ HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" Content="{TemplateBinding Header}" + ContentTemplate="{TemplateBinding HeaderTemplate}" Focusable="False" Foreground="{TemplateBinding Foreground}" /> From 9d17cd00877bfce11106b2b14378bc57f45028d9 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Fri, 26 May 2023 20:18:43 +0800 Subject: [PATCH 05/15] misc: add binding demo. --- .../Pages/TreeViewDemo.axaml | 14 +++++++-- .../Pages/TreeViewDemo.axaml.cs | 31 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml index 5b3a663..4cbba96 100644 --- a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml @@ -4,10 +4,13 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:vm="clr-namespace:Semi.Avalonia.Demo.Pages" d:DesignHeight="450" d:DesignWidth="800" + x:CompileBindings="True" + x:DataType="vm:TreeViewVm" mc:Ignorable="d"> - + @@ -42,5 +45,12 @@ - + + + + + + + + diff --git a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs index 523ce73..1bd90f7 100644 --- a/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs +++ b/demo/Semi.Avalonia.Demo/Pages/TreeViewDemo.axaml.cs @@ -1,6 +1,8 @@ +using System.Collections.ObjectModel; using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; +using CommunityToolkit.Mvvm.ComponentModel; namespace Semi.Avalonia.Demo.Pages; @@ -9,5 +11,34 @@ public partial class TreeViewDemo : UserControl public TreeViewDemo() { InitializeComponent(); + this.DataContext = new TreeViewVm(); } +} + +public class TreeViewVm : ObservableObject +{ + public ObservableCollection Items { get; set; } + + public TreeViewVm() + { + Items = new ObservableCollection() + { + new TreeViewItemVm() {Name = "Item 1", Id = "1"}, + new TreeViewItemVm() {Name = "Item 2", Id = "2"}, + new TreeViewItemVm() {Name = "Item 3", Id = "3", Items = new ObservableCollection() + { + new TreeViewItemVm() {Name = "Item 3.1", Id = "3.1"}, + new TreeViewItemVm() {Name = "Item 3.2", Id = "3.2"}, + new TreeViewItemVm() {Name = "Item 3.3", Id = "3.3"}, + }, + }, + }; + } +} + +public partial class TreeViewItemVm : ObservableObject +{ + public ObservableCollection Items { get; set; } + public string Name { get; set; } + public string Id { get; set; } } \ No newline at end of file From e999aeac23e078aaf93aea14c563f1fd56d6453b Mon Sep 17 00:00:00 2001 From: rabbitism Date: Fri, 26 May 2023 20:31:57 +0800 Subject: [PATCH 06/15] fix: fix button and label text color in dark mode. --- src/Semi.Avalonia/Themes/Dark/Button.axaml | 2 +- src/Semi.Avalonia/Themes/Dark/Label.axaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Semi.Avalonia/Themes/Dark/Button.axaml b/src/Semi.Avalonia/Themes/Dark/Button.axaml index 5586dc2..131c68d 100644 --- a/src/Semi.Avalonia/Themes/Dark/Button.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Button.axaml @@ -36,7 +36,7 @@ - + diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml index 7f23e92..a489379 100644 --- a/src/Semi.Avalonia/Themes/Dark/Label.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml @@ -1,5 +1,6 @@ @@ -83,7 +84,7 @@ - + From c2b5b01f34dd6998e560a74595db605f267329b4 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Fri, 26 May 2023 20:43:18 +0800 Subject: [PATCH 07/15] fix: togglebutton text color in dark mode. --- src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml index 9f01c67..0c35d26 100644 --- a/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml +++ b/src/Semi.Avalonia/Themes/Dark/ToggleButton.axaml @@ -49,7 +49,7 @@ - + From 3289295278e143602237267f7fbac7392eedf810 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sun, 28 May 2023 23:30:45 +0800 Subject: [PATCH 08/15] fix: fix wrong colors. --- src/Semi.Avalonia/Controls/Label.axaml | 1 + src/Semi.Avalonia/Themes/Dark/Label.axaml | 13 +++++++------ src/Semi.Avalonia/Themes/Light/Label.axaml | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Semi.Avalonia/Controls/Label.axaml b/src/Semi.Avalonia/Controls/Label.axaml index 052394a..1f5945d 100644 --- a/src/Semi.Avalonia/Controls/Label.axaml +++ b/src/Semi.Avalonia/Controls/Label.axaml @@ -342,6 +342,7 @@ diff --git a/src/Semi.Avalonia/Themes/Dark/Label.axaml b/src/Semi.Avalonia/Themes/Dark/Label.axaml index a489379..a7e2ce0 100644 --- a/src/Semi.Avalonia/Themes/Dark/Label.axaml +++ b/src/Semi.Avalonia/Themes/Dark/Label.axaml @@ -29,8 +29,8 @@ - - + + @@ -41,13 +41,13 @@ - - + + - - + + @@ -81,6 +81,7 @@ + diff --git a/src/Semi.Avalonia/Themes/Light/Label.axaml b/src/Semi.Avalonia/Themes/Light/Label.axaml index 4ad4f42..b2ee04d 100644 --- a/src/Semi.Avalonia/Themes/Light/Label.axaml +++ b/src/Semi.Avalonia/Themes/Light/Label.axaml @@ -28,8 +28,8 @@ - - + + From 49c95dcb5e00d949cef78468d68496e673781a6e Mon Sep 17 00:00:00 2001 From: rabbitism Date: Tue, 30 May 2023 11:10:24 +0800 Subject: [PATCH 09/15] feat: upgrade to latest nightly. --- demo/Directory.Build.props | 2 +- src/Package.props | 2 +- .../Controls/ColorPicker.axaml | 4 +-- .../Controls/ColorView.axaml | 4 +-- .../TransitioningContentControl.axaml | 34 +++++++++++++------ 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props index 4b12cba..909dbc2 100644 --- a/demo/Directory.Build.props +++ b/demo/Directory.Build.props @@ -1,6 +1,6 @@ enable - 11.0.0-preview8 + 11.0.999-cibuild0035738-beta diff --git a/src/Package.props b/src/Package.props index 4b0f2f6..e04bc15 100644 --- a/src/Package.props +++ b/src/Package.props @@ -7,7 +7,7 @@ IRIHI Technology Avalonia Theme inspired by Semi Design. https://github.com/irihitech/Semi.Avalonia - 11.0.0-preview8 + 11.0.999-cibuild0035738-beta MIT \ No newline at end of file diff --git a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml index 08315af..396c747 100644 --- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml +++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml @@ -135,8 +135,8 @@ ColorComponent="{Binding ThirdComponent, ElementName=ColorSpectrum}" ColorModel="Hsva" HsvColor="{Binding HsvColor, ElementName=ColorSpectrum}" - IsAlphaMaxForced="True" - IsSaturationValueMaxForced="False" + IsAlphaVisible="True" + IsPerceptive="False" IsVisible="{TemplateBinding IsColorSpectrumSliderVisible}" Orientation="Vertical" /> - + + + + From 4842270a9685177c7d3d80ab2cb361c0cc3a25fb Mon Sep 17 00:00:00 2001 From: rabbitism Date: Tue, 30 May 2023 12:09:24 +0800 Subject: [PATCH 10/15] fix: fix scrollviewer binding according to https://github.com/AvaloniaUI/Avalonia/pull/11456 --- src/Semi.Avalonia/Controls/ScrollViewer.axaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Semi.Avalonia/Controls/ScrollViewer.axaml b/src/Semi.Avalonia/Controls/ScrollViewer.axaml index 6960c16..9bda75f 100644 --- a/src/Semi.Avalonia/Controls/ScrollViewer.axaml +++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml @@ -214,13 +214,14 @@ Background="{TemplateBinding Background}" HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}" HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}" + ScrollViewer.IsScrollInertiaEnabled="{TemplateBinding IsScrollInertiaEnabled}" VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}" VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}"> + IsScrollInertiaEnabled="{Binding (ScrollViewer.IsScrollInertiaEnabled), ElementName=PART_ContentPresenter}" /> + IsScrollInertiaEnabled="{Binding (ScrollViewer.IsScrollInertiaEnabled), ElementName=PART_ContentPresenter}" /> Date: Thu, 1 Jun 2023 09:46:06 +0800 Subject: [PATCH 11/15] misc: upgrade to rc1 --- demo/Directory.Build.props | 2 +- src/Package.props | 4 ++-- .../Semi.Avalonia.ColorPicker.csproj | 2 +- src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj | 2 +- src/Semi.Avalonia/Semi.Avalonia.csproj | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props index 909dbc2..5d0335b 100644 --- a/demo/Directory.Build.props +++ b/demo/Directory.Build.props @@ -1,6 +1,6 @@ enable - 11.0.999-cibuild0035738-beta + 11.0.0-rc1 diff --git a/src/Package.props b/src/Package.props index e04bc15..709abb8 100644 --- a/src/Package.props +++ b/src/Package.props @@ -3,11 +3,11 @@ net6.0;netstandard2.0 enable 10 - 0.1.0-preview8 + 11.0.0-rc1 IRIHI Technology Avalonia Theme inspired by Semi Design. https://github.com/irihitech/Semi.Avalonia - 11.0.999-cibuild0035738-beta + 11.0.0-rc1 MIT \ No newline at end of file diff --git a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj index 0d84a9d..1ce6a9e 100644 --- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj +++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj @@ -4,7 +4,7 @@ Semi.Avalonia.ColorPicker - Update to Avalonia 11.0.0-preview8 + Update to Avalonia 11.0.0-rc1 diff --git a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj index 4cc36a5..e84e6b4 100644 --- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj +++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj @@ -4,7 +4,7 @@ Semi.Avalonia.DataGrid - Update to Avalonia 11.0.0-preview8 + Update to Avalonia 11.0.0-rc1 diff --git a/src/Semi.Avalonia/Semi.Avalonia.csproj b/src/Semi.Avalonia/Semi.Avalonia.csproj index 23333d8..9579c92 100644 --- a/src/Semi.Avalonia/Semi.Avalonia.csproj +++ b/src/Semi.Avalonia/Semi.Avalonia.csproj @@ -4,7 +4,7 @@ Semi.Avalonia - Update to Avalonia 11.0.0-preview8 + Update to Avalonia 11.0.0-rc1 From f72ec2057691125169f45c806b6471fe8df1dd70 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 1 Jun 2023 09:49:51 +0800 Subject: [PATCH 12/15] misc: upgrade to 1.1 --- demo/Directory.Build.props | 2 +- src/Package.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/Directory.Build.props b/demo/Directory.Build.props index 5d0335b..5a014d1 100644 --- a/demo/Directory.Build.props +++ b/demo/Directory.Build.props @@ -1,6 +1,6 @@ enable - 11.0.0-rc1 + 11.0.0-rc1.1 diff --git a/src/Package.props b/src/Package.props index 709abb8..0143a6e 100644 --- a/src/Package.props +++ b/src/Package.props @@ -7,7 +7,7 @@ IRIHI Technology Avalonia Theme inspired by Semi Design. https://github.com/irihitech/Semi.Avalonia - 11.0.0-rc1 + 11.0.0-rc1.1 MIT \ No newline at end of file From e6a3274db9fd042d05524976bff0d0ea7c89c2a0 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 1 Jun 2023 10:09:41 +0800 Subject: [PATCH 13/15] docs: update docs. --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f8309f1..9050702 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,11 @@ Avalonia Theme inspired by Semi Design -> Semi.Avalonia is still in very early stage. Please don't use in production. - # How to Use ## Installation ```bash -dotnet add package Semi.Avalonia --version 0.1.0-preview8 +dotnet add package Semi.Avalonia --version 11.0.0-rc1 ``` Include Semi Design Styles in application: @@ -25,8 +23,8 @@ That's all. DataGrid and ColorPicker are distributed in separated packages. Please install if you need. ```bash -dotnet add package Semi.Avalonia.ColorPicker --version 0.1.0-preview8 -dotnet add package Semi.Avalonia.DataGrid --version 0.1.0-preview8 +dotnet add package Semi.Avalonia.ColorPicker --version 11.0.0-rc1 +dotnet add package Semi.Avalonia.DataGrid --version 11.0.0-rc1 ``` ```xaml @@ -44,6 +42,7 @@ https://github.com/irihitech/Semi.Avalonia/releases | Semi Design Version | Avalonia Version | |:--------------------|:-----------------| +| 11.0.0-rc1 | 11.0.0-rc1.1 | | 0.1.0-preview3 | 11.0-preview4 | | 0.1.0-preview5.x | 11.0-preview5 | | 0.1.0-preview6.x | 11.0-preview6 | From 21a07b703dc0bee7dab9f7b2a66120017670429e Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 1 Jun 2023 10:25:18 +0800 Subject: [PATCH 14/15] misc: update a demo color. --- demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml index 52882ed..00dfd4a 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/ScrollViewerDemo.axaml @@ -16,7 +16,7 @@ + Fill="{DynamicResource SemiYellow2}" /> + Fill="{DynamicResource SemiYellow2}" /> From 20307f0c1b695ef84cb90e4d499a1c749e458248 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:41:21 +0800 Subject: [PATCH 15/15] fix: add missing success button. --- .../Pages/HeaderedContentControlDemo.axaml | 8 +++++--- demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml index dbdabf7..d5c312b 100644 --- a/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/HeaderedContentControlDemo.axaml @@ -5,8 +5,10 @@ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="Semi.Avalonia.Demo.Pages.HeaderedContentControlDemo"> - - Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。 - + + + Semi Design 是由互娱社区前端团队与 UED 团队共同设计开发并维护的设计系统。设计系统包含设计语言以及一整套可复用的前端组件，帮助设计师与开发者更容易地打造高质量的、用户体验一致的、符合设计规范的 Web 应用。 + + \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml index 8064cfc..5bf1e7f 100644 --- a/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/RepeatButtonDemo.axaml @@ -13,6 +13,7 @@ Primary Secondary Tertiary + Success Warning Danger Danger @@ -22,6 +23,7 @@ Primary Secondary Tertiary + Success Warning Danger Primary Secondary Tertiary + Success Warning Danger