From 0e3170eba2690396136c37d1809d83be7f16e48b Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 09:40:08 +0800 Subject: [PATCH 01/11] feat: upgrade to preview6 --- .../Semi.Avalonia.Demo.Android.csproj | 2 +- .../Semi.Avalonia.Demo.Desktop.csproj | 4 ++-- demo/Semi.Avalonia.Demo.Web/Program.cs | 2 +- .../Semi.Avalonia.Demo.Web.csproj | 4 ++-- .../Pages/ThemeVariantDemo.axaml.cs | 12 +----------- demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj | 7 +++---- src/Package.props | 2 +- .../Controls/ColorPicker.axaml | 2 +- 8 files changed, 12 insertions(+), 23 deletions(-) diff --git a/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj b/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj index ee9c799..bbbd0b6 100644 --- a/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj +++ b/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj @@ -13,7 +13,7 @@ - + diff --git a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj index d66a760..f560c73 100644 --- a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj +++ b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj @@ -20,9 +20,9 @@ - + - + diff --git a/demo/Semi.Avalonia.Demo.Web/Program.cs b/demo/Semi.Avalonia.Demo.Web/Program.cs index 1d15e3a..37143f0 100644 --- a/demo/Semi.Avalonia.Demo.Web/Program.cs +++ b/demo/Semi.Avalonia.Demo.Web/Program.cs @@ -10,7 +10,7 @@ internal partial class Program { private static void Main(string[] args) { - BuildAvaloniaApp().SetupBrowserApp("out"); + BuildAvaloniaApp(); //.SetupBrowserApp("out"); } public static AppBuilder BuildAvaloniaApp() diff --git a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj index 4598ae8..14757ac 100644 --- a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj +++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/demo/Semi.Avalonia.Demo/Pages/ThemeVariantDemo.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/ThemeVariantDemo.axaml.cs index 92ea50b..2d80dd9 100644 --- a/demo/Semi.Avalonia.Demo/Pages/ThemeVariantDemo.axaml.cs +++ b/demo/Semi.Avalonia.Demo/Pages/ThemeVariantDemo.axaml.cs @@ -8,7 +8,6 @@ namespace Semi.Avalonia.Demo.Pages; public partial class ThemeVariantDemo : UserControl { - private ThemeVariant _variant = ThemeVariant.Default; public ThemeVariantDemo() { InitializeComponent(); @@ -16,15 +15,6 @@ public partial class ThemeVariantDemo : UserControl private void Switch_OnIsCheckedChanged(object sender, RoutedEventArgs e) { - if (_variant == ThemeVariant.Dark) - { - scope.RequestedThemeVariant = ThemeVariant.Default; - _variant = ThemeVariant.Default; - } - else - { - scope.RequestedThemeVariant = ThemeVariant.Dark; - _variant = ThemeVariant.Dark; - } + scope.RequestedThemeVariant = scope.ActualThemeVariant == ThemeVariant.Dark ? ThemeVariant.Light : ThemeVariant.Dark; } } \ No newline at end of file diff --git a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj index ad24460..1e21168 100644 --- a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj +++ b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj @@ -11,12 +11,11 @@ - - + + - + - diff --git a/src/Package.props b/src/Package.props index e686147..b346f5e 100644 --- a/src/Package.props +++ b/src/Package.props @@ -7,6 +7,6 @@ IRIHI Technology Avalonia Theme inspired by Semi Design. https://github.com/irihitech/Semi.Avalonia - 11.0.0-preview5 + 11.0.0-preview6 \ 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 2a7bea5..378ce38 100644 --- a/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml +++ b/src/Semi.Avalonia.ColorPicker/Controls/ColorPicker.axaml @@ -61,7 +61,7 @@ - + + M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z diff --git a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml index 76a6dc9..4781976 100644 --- a/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml +++ b/src/Semi.Avalonia/Themes/Light/CalendarDatePicker.axaml @@ -1,6 +1,7 @@ + M4 20V8H20V20H4ZM2 4C2 2.89543 2.89543 2 4 2H20C21.1046 2 22 2.89543 22 4V20C22 21.1046 21.1046 22 20 22H4C2.89543 22 2 21.1046 2 20V4ZM6 10.5C6 10.2239 6.22386 10 6.5 10H8.5C8.77614 10 9 10.2239 9 10.5V12.5C9 12.7761 8.77614 13 8.5 13H6.5C6.22386 13 6 12.7761 6 12.5V10.5ZM6.5 15C6.22386 15 6 15.2239 6 15.5V17.5C6 17.7761 6.22386 18 6.5 18H8.5C8.77614 18 9 17.7761 9 17.5V15.5C9 15.2239 8.77614 15 8.5 15H6.5ZM10.5 10.5C10.5 10.2239 10.7239 10 11 10H13C13.2761 10 13.5 10.2239 13.5 10.5V12.5C13.5 12.7761 13.2761 13 13 13H11C10.7239 13 10.5 12.7761 10.5 12.5V10.5ZM11 15C10.7239 15 10.5 15.2239 10.5 15.5V17.5C10.5 17.7761 10.7239 18 11 18H13C13.2761 18 13.5 17.7761 13.5 17.5V15.5C13.5 15.2239 13.2761 15 13 15H11ZM15 10.5C15 10.2239 15.2239 10 15.5 10H17.5C17.7761 10 18 10.2239 18 10.5V12.5C18 12.7761 17.7761 13 17.5 13H15.5C15.2239 13 15 12.7761 15 12.5V10.5ZM15.5 15C15.2239 15 15 15.2239 15 15.5V17.5C15 17.7761 15.2239 18 15.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 17.7761 15 17.5 15H15.5Z From 3fd209f180efb11045afa9028aab77f2cd45f2b9 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 10:54:01 +0800 Subject: [PATCH 03/11] fix: fix dropdownbutton glyph color. --- src/Semi.Avalonia/Controls/DropdownButton.axaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Semi.Avalonia/Controls/DropdownButton.axaml b/src/Semi.Avalonia/Controls/DropdownButton.axaml index 235b90b..f575a00 100644 --- a/src/Semi.Avalonia/Controls/DropdownButton.axaml +++ b/src/Semi.Avalonia/Controls/DropdownButton.axaml @@ -44,7 +44,7 @@ HorizontalAlignment="Right" VerticalAlignment="Center" Data="{DynamicResource DropdownButtonIconGlyph}" - Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}" + Foreground="{TemplateBinding Foreground}" IsHitTestVisible="False" UseLayoutRounding="False" /> @@ -137,7 +137,7 @@ HorizontalAlignment="Right" VerticalAlignment="Center" Data="{DynamicResource DropdownButtonIconGlyph}" - Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}" + Foreground="{TemplateBinding Foreground}" IsHitTestVisible="False" UseLayoutRounding="False" /> From 874c4ab2603baa341ed525019d12b7b108c0dade Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 11:01:41 +0800 Subject: [PATCH 04/11] fix: fix combobox default colors. --- src/Semi.Avalonia/Controls/ComboBox.axaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Semi.Avalonia/Controls/ComboBox.axaml b/src/Semi.Avalonia/Controls/ComboBox.axaml index 4ef3231..e79c857 100644 --- a/src/Semi.Avalonia/Controls/ComboBox.axaml +++ b/src/Semi.Avalonia/Controls/ComboBox.axaml @@ -31,9 +31,7 @@ - - @@ -63,6 +61,7 @@ Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" + Foreground="{TemplateBinding Foreground}" IsVisible="{TemplateBinding SelectionBoxItem, Converter={x:Static ObjectConverters.IsNull}}" Opacity="0.3" From 4f28569781e21873bf502f2d3d7998b57bc0709b Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 11:43:31 +0800 Subject: [PATCH 05/11] fix: fix menu button foreground issue. --- src/Semi.Avalonia/Controls/Menu.axaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Semi.Avalonia/Controls/Menu.axaml b/src/Semi.Avalonia/Controls/Menu.axaml index be1e5a0..417efd1 100644 --- a/src/Semi.Avalonia/Controls/Menu.axaml +++ b/src/Semi.Avalonia/Controls/Menu.axaml @@ -81,9 +81,6 @@ - From 34f0e53627f650be8000cb06cb8cb2b65dbb8d3a Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 11:49:28 +0800 Subject: [PATCH 06/11] fix: fix date/time picker color. --- src/Semi.Avalonia/Controls/DatePicker.axaml | 6 ++---- src/Semi.Avalonia/Controls/DateTimePickerShared.axaml | 6 ++---- src/Semi.Avalonia/Controls/TimePicker.axaml | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml index c509681..bec8282 100644 --- a/src/Semi.Avalonia/Controls/DatePicker.axaml +++ b/src/Semi.Avalonia/Controls/DatePicker.axaml @@ -92,8 +92,7 @@ + Data="{DynamicResource DateTimePickerAcceptGlyph}" /> + Data="{DynamicResource DateTimePickerButtonUpGlyph}" /> @@ -125,8 +124,7 @@ Height="8" HorizontalAlignment="Center" VerticalAlignment="Center" - Data="{DynamicResource DateTimePickerButtonDownGlyph}" - Foreground="{Binding $parent[ContentPresenter].Foreground}" /> + Data="{DynamicResource DateTimePickerButtonDownGlyph}" /> diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml index eb7e0ad..d504fb6 100644 --- a/src/Semi.Avalonia/Controls/TimePicker.axaml +++ b/src/Semi.Avalonia/Controls/TimePicker.axaml @@ -96,8 +96,7 @@ + Data="{DynamicResource DateTimePickerAcceptGlyph}" /> Date: Wed, 22 Mar 2023 11:50:38 +0800 Subject: [PATCH 07/11] fix: fix toggle switch foreground issue. --- src/Semi.Avalonia/Controls/ToggleSwitch.axaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml index fe1de04..a529aea 100644 --- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml +++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml @@ -11,7 +11,6 @@ - From 33db3bf0d413feb0657c3e9c7c4155a81693f58f Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 12:02:02 +0800 Subject: [PATCH 08/11] fix: fix carousel collection conversion. --- src/Semi.Avalonia/Controls/Carousel.axaml | 4 ++-- src/Semi.Avalonia/Converters/ItemToObjectConverter.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml index 74bce8e..c2f3ce9 100644 --- a/src/Semi.Avalonia/Controls/Carousel.axaml +++ b/src/Semi.Avalonia/Controls/Carousel.axaml @@ -141,8 +141,8 @@ HorizontalAlignment="Center" VerticalAlignment="Center" ItemContainerTheme="{DynamicResource CarouselIndicatorDotListBoxItem}" - Items="{TemplateBinding Items, - Converter={StaticResource ItemsConverter}}" + ItemsSource="{TemplateBinding Items, + Converter={StaticResource ItemsConverter}}" SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"> diff --git a/src/Semi.Avalonia/Converters/ItemToObjectConverter.cs b/src/Semi.Avalonia/Converters/ItemToObjectConverter.cs index 1f178d1..33ca778 100644 --- a/src/Semi.Avalonia/Converters/ItemToObjectConverter.cs +++ b/src/Semi.Avalonia/Converters/ItemToObjectConverter.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using Avalonia.Collections; +using Avalonia.Controls; using Avalonia.Data.Converters; namespace Semi.Avalonia.Converters; @@ -11,7 +12,7 @@ public class ItemToObjectConverter: IValueConverter { public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture) { - if (value is AvaloniaList list) + if (value is ItemCollection list) { return list.Select(a => new object()); } From 5a9596a2be7bfc55a7f682dbdc7c3ec7c4bb81ff Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 12:24:49 +0800 Subject: [PATCH 09/11] fix: a temporary fix of grid splitter preview. --- src/Semi.Avalonia/Controls/GridSplitter.axaml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Semi.Avalonia/Controls/GridSplitter.axaml b/src/Semi.Avalonia/Controls/GridSplitter.axaml index 13ab88a..0748fa6 100644 --- a/src/Semi.Avalonia/Controls/GridSplitter.axaml +++ b/src/Semi.Avalonia/Controls/GridSplitter.axaml @@ -6,6 +6,7 @@ + From b0cba0e5a9750e8797008d3ea21f9225a8b98b5b Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 12:58:23 +0800 Subject: [PATCH 10/11] misc: update release info. --- README.md | 15 ++++++++------- src/Package.props | 2 +- .../Semi.Avalonia.ColorPicker.csproj | 2 +- .../Semi.Avalonia.DataGrid.csproj | 2 +- src/Semi.Avalonia/Semi.Avalonia.csproj | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6659b68..25a7ce9 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Avalonia Theme inspired by Semi Design ## Installation ```bash -dotnet add package Semi.Avalonia --version 0.1.0-preview5.4 +dotnet add package Semi.Avalonia --version 0.1.0-preview6 ``` Include Semi Design Styles in application: @@ -25,8 +25,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-preview5.2 -dotnet add package Semi.Avalonia.DataGrid --version 0.1.0-preview5.2 +dotnet add package Semi.Avalonia.ColorPicker --version 0.1.0-preview6 +dotnet add package Semi.Avalonia.DataGrid --version 0.1.0-preview6 ``` ```xaml @@ -42,10 +42,11 @@ https://github.com/irihitech/Semi.Avalonia/releases ## Version compatibility -| Semi Design Version | Avalonia Version| -|:--------------------|:---| -| 0.1.0-preview3 |11.0-preview4| -| 0.1.0-preview5.x |11.0-preview5| +| Semi Design Version | Avalonia Version | +|:--------------------|:-----------------| +| 0.1.0-preview3 | 11.0-preview4 | +| 0.1.0-preview5.x | 11.0-preview5 | +| 0.1.0-preview6.x | 11.0-preview6 | ## TODO * DataValidationErrors diff --git a/src/Package.props b/src/Package.props index b346f5e..ca3ea60 100644 --- a/src/Package.props +++ b/src/Package.props @@ -3,7 +3,7 @@ net6.0;netstandard2.0 enable 10 - 0.1.0-preview5.4 + 0.1.0-preview6 IRIHI Technology Avalonia Theme inspired by Semi Design. https://github.com/irihitech/Semi.Avalonia diff --git a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj index 5cc8da2..a4331ef 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 - Add Native AOT support. + Upgrade to Avalonia 11.0.0-preview6. diff --git a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj index 5f2e3aa..638cb34 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 - Add Native AOT support. + Upgrade to Avalonia 11.0.0-preview6. diff --git a/src/Semi.Avalonia/Semi.Avalonia.csproj b/src/Semi.Avalonia/Semi.Avalonia.csproj index a7e7e62..60a5285 100644 --- a/src/Semi.Avalonia/Semi.Avalonia.csproj +++ b/src/Semi.Avalonia/Semi.Avalonia.csproj @@ -4,7 +4,7 @@ Semi.Avalonia - Add new CheckBox Theme, Bug fixes. + Upgrade to Avalonia 11.0.0-preview6. From cd533c65bc28be2be43553b1c498af2a9aff9a71 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 22 Mar 2023 13:25:07 +0800 Subject: [PATCH 11/11] fix: fix toggle switch font size. --- src/Semi.Avalonia/Controls/ToggleSwitch.axaml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml index a529aea..e8bae03 100644 --- a/src/Semi.Avalonia/Controls/ToggleSwitch.axaml +++ b/src/Semi.Avalonia/Controls/ToggleSwitch.axaml @@ -15,7 +15,6 @@ -