zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-04-27 19:53:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #605 from irihitech/pack

Browse Source 
optimize Theme style references for Separate Packages
This commit is contained in:
Dong Bin
2025-04-23 22:39:27 +08:00
committed by GitHub
parent 04c810275a 77ee768962
commit 96cff5df74
12 changed files with 91 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -48,9 +48,9 @@ dotnet add package Semi.Avalonia.TreeDataGrid
```xaml ```xaml
<Application.Styles> <Application.Styles>
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" /> <semi:ColorPickerSemiTheme />
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" /> <semi:DataGridSemiTheme />
<StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" /> <semi:TreeDataGridSemiTheme />
</Application.Styles> </Application.Styles>
``` ```

6
README_CN.md
View File

@@ -48,9 +48,9 @@ dotnet add package Semi.Avalonia.TreeDataGrid
```xaml ```xaml
<Application.Styles> <Application.Styles>
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" /> <semi:ColorPickerSemiTheme />
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" /> <semi:DataGridSemiTheme />
<StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" /> <semi:TreeDataGridSemiTheme />
</Application.Styles> </Application.Styles>
``` ```

11
demo/Semi.Avalonia.Demo/App.axaml
View File

@@ -7,19 +7,16 @@
xmlns:semi="https://irihi.tech/semi" xmlns:semi="https://irihi.tech/semi"
xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels"> xmlns:viewModels="clr-namespace:Semi.Avalonia.Demo.ViewModels">
<Application.Styles> <Application.Styles>
<!-- You can still reference in old way. -->
<!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
<semi:SemiTheme Locale="zh-CN" /> <semi:SemiTheme Locale="zh-CN" />
<semi:SemiPopupAnimations /> <semi:SemiPopupAnimations />
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" /> <semi:ColorPickerSemiTheme />
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" /> <semi:DataGridSemiTheme />
<StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" /> <semi:TreeDataGridSemiTheme />
</Application.Styles> </Application.Styles>
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceInclude <ResourceInclude Source="Themes/_index.axaml" />
Source="Themes/_index.axaml" />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </Application.Resources>

8
demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs
View File

@@ -14,8 +14,6 @@ public partial class Overview : UserControl
public string MainStyle { get; set; } = public string MainStyle { get; set; } =
""" """
<Application.Styles> <Application.Styles>
<!-- You can still reference in old way. -->
<!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
<semi:SemiTheme Locale="zh-CN" /> <semi:SemiTheme Locale="zh-CN" />
</Application.Styles> </Application.Styles>
"""; """;
@@ -25,7 +23,7 @@ public partial class Overview : UserControl
public string ColorPickerStyle { get; set; } = public string ColorPickerStyle { get; set; } =
""" """
<Application.Styles> <Application.Styles>
<StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" /> <semi:ColorPickerSemiTheme />
</Application.Styles> </Application.Styles>
"""; """;
@@ -34,7 +32,7 @@ public partial class Overview : UserControl
public string DataGridStyle { get; set; } = public string DataGridStyle { get; set; } =
""" """
<Application.Styles> <Application.Styles>
<StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" /> <semi:DataGridSemiTheme />
</Application.Styles> </Application.Styles>
"""; """;
@@ -43,7 +41,7 @@ public partial class Overview : UserControl
public string TreeDataGridStyle { get; set; } = public string TreeDataGridStyle { get; set; } =
""" """
<Application.Styles> <Application.Styles>
<StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" /> <semi:TreeDataGridSemiTheme />
</Application.Styles> </Application.Styles>
"""; """;
} }

17
src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml Normal file
View File

@@ -0,0 +1,17 @@
<Styles
x:Class="Semi.Avalonia.ColorPicker.ColorPickerSemiTheme"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Styles.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceInclude x:Key="Default" Source="Light.axaml" />
<ResourceInclude x:Key="Dark" Source="Dark.axaml" />
</ResourceDictionary.ThemeDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="Controls/_index.axaml" />
<ResourceInclude Source="Shared.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Styles.Resources>
</Styles>

7
src/Semi.Avalonia.ColorPicker/ColorPickerSemiTheme.axaml.cs Normal file
View File

@@ -0,0 +1,7 @@
using Avalonia.Styling;
namespace Semi.Avalonia.ColorPicker;
public class ColorPickerSemiTheme : Styles
{
}

3
src/Semi.Avalonia.DataGrid/AssemblyInfo.cs Normal file
View File

@@ -0,0 +1,3 @@
using Avalonia.Metadata;
[assembly: XmlnsDefinition("https://irihi.tech/semi", "Semi.Avalonia.DataGrid")]

17
src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml Normal file
View File

@@ -0,0 +1,17 @@
<Styles
x:Class="Semi.Avalonia.DataGrid.DataGridSemiTheme"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Styles.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceInclude x:Key="Default" Source="Light.axaml" />
<ResourceInclude x:Key="Dark" Source="Dark.axaml" />
</ResourceDictionary.ThemeDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="DataGrid.axaml" />
<ResourceInclude Source="Shared.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Styles.Resources>
</Styles>

7
src/Semi.Avalonia.DataGrid/DataGridSemiTheme.axaml.cs Normal file
View File

@@ -0,0 +1,7 @@
using Avalonia.Styling;
namespace Semi.Avalonia.DataGrid;
public class DataGridSemiTheme : Styles
{
}

3
src/Semi.Avalonia.TreeDataGrid/AssemblyInfo.cs Normal file
View File

@@ -0,0 +1,3 @@
using Avalonia.Metadata;
[assembly: XmlnsDefinition("https://irihi.tech/semi", "Semi.Avalonia.TreeDataGrid")]

17
src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml Normal file
View File

@@ -0,0 +1,17 @@
<Styles
x:Class="Semi.Avalonia.TreeDataGrid.TreeDataGridSemiTheme"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Styles.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceInclude x:Key="Default" Source="Light.axaml" />
<ResourceInclude x:Key="Dark" Source="Dark.axaml" />
</ResourceDictionary.ThemeDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="TreeDataGrid.axaml" />
<ResourceInclude Source="Shared.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Styles.Resources>
</Styles>

7
src/Semi.Avalonia.TreeDataGrid/TreeDataGridSemiTheme.axaml.cs Normal file
View File

@@ -0,0 +1,7 @@
using Avalonia.Styling;
namespace Semi.Avalonia.TreeDataGrid;
public class TreeDataGridSemiTheme : Styles
{
}