From 49c95dcb5e00d949cef78468d68496e673781a6e Mon Sep 17 00:00:00 2001 From: rabbitism Date: Tue, 30 May 2023 11:10:24 +0800 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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