From 4dabb53ed8fdf247fa4390527fcc05a8bc4faf4b Mon Sep 17 00:00:00 2001 From: qinware Date: Wed, 6 Aug 2025 17:30:21 +0800 Subject: [PATCH] Refactor AbstractLanguageProvider --- build/Version.props | 2 +- .../LanguageProviderPool.g.cs | 16 ---- .../LanguageResourceConst.g.cs | 14 ---- .../ControlTokenTypePool.g.cs | 15 ---- .../TokenResourceConst.g.cs | 83 ------------------- .../Localization/en_US.cs | 1 + .../Localization/zh_CN.cs | 1 + .../ThemeManagerBuilderExtensions.cs | 1 + .../DatePicker/Localization/en_US.cs | 1 + .../DatePicker/Localization/zh_CN.cs | 1 + .../LanguageProviderPool.g.cs | 3 +- .../LanguageResourceConst.g.cs | 1 + src/AtomUI.Controls/Localization/en_US.cs | 1 + src/AtomUI.Controls/Localization/zh_CN.cs | 1 + .../Pagination/Localization/en_US.cs | 1 + .../Pagination/Localization/zh_CN.cs | 1 + .../PopupConfirm/Localization/en_US.cs | 1 + .../PopupConfirm/Localization/zh_CN.cs | 1 + .../ThemeManagerBuilderExtensions.cs | 1 + .../TimePicker/Localization/en_US.cs | 1 + .../TimePicker/Localization/zh_CN.cs | 1 + .../LangResourceKeyClassSourceWriter.cs | 1 + .../LanguageProviderPoolClassSourceWriter.cs | 3 +- src/AtomUI.Generator/TargetMarkConstants.cs | 2 +- src/AtomUI.Theme/AbstractLanguageProvider.cs | 1 + .../Data/LanguageResourceBinder.cs | 3 +- .../LanguageProviderPool.g.cs | 3 +- .../LanguageResourceConst.g.cs | 3 +- .../{ => Language}/ILanguageProvider.cs | 2 +- .../LanguageProviderAttribute.cs | 2 +- .../{ => Language}/LanguageResourceKey.cs | 2 +- src/AtomUI.Theme/Theme.cs | 1 - src/AtomUI.Theme/ThemeManager.cs | 1 + 33 files changed, 33 insertions(+), 139 deletions(-) delete mode 100644 src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs delete mode 100644 src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs delete mode 100644 src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs delete mode 100644 src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs rename src/AtomUI.Theme/{ => Language}/ILanguageProvider.cs (88%) rename src/AtomUI.Theme/{ => Language}/LanguageProviderAttribute.cs (95%) rename src/AtomUI.Theme/{ => Language}/LanguageResourceKey.cs (97%) diff --git a/build/Version.props b/build/Version.props index 0623b24fd..847758334 100644 --- a/build/Version.props +++ b/build/Version.props @@ -1,7 +1,7 @@ $(NoWarn);CS7035 - 11.3.2 + 11.3.3 0.1.0 0.1.1 diff --git a/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs b/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs deleted file mode 100644 index 2de687db6..000000000 --- a/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; -using AtomUI.Theme; - -namespace AtomUI.Theme -{ - internal class LanguageProviderPool - { - internal static IList GetLanguageProviders() - { - List languageProviders = new List(); - languageProviders.Add(new AtomUI.Controls.DataGridLocalization.en_US()); - languageProviders.Add(new AtomUI.Controls.DataGridLocalization.zh_CN()); - return languageProviders; - } - } -} \ No newline at end of file diff --git a/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs b/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs deleted file mode 100644 index 698850117..000000000 --- a/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs +++ /dev/null @@ -1,14 +0,0 @@ -using AtomUI.Theme; - -namespace AtomUI.Controls.DataGridLocalization -{ - public static class DataGridLangResourceKey - { - public static readonly LanguageResourceKey AscendTooltip = new LanguageResourceKey("DataGrid.AscendTooltip", "AtomUI.Lang"); - public static readonly LanguageResourceKey CancelConfirmText = new LanguageResourceKey("DataGrid.CancelConfirmText", "AtomUI.Lang"); - public static readonly LanguageResourceKey CancelTooltip = new LanguageResourceKey("DataGrid.CancelTooltip", "AtomUI.Lang"); - public static readonly LanguageResourceKey DeleteConfirmText = new LanguageResourceKey("DataGrid.DeleteConfirmText", "AtomUI.Lang"); - public static readonly LanguageResourceKey DescendTooltip = new LanguageResourceKey("DataGrid.DescendTooltip", "AtomUI.Lang"); - public static readonly LanguageResourceKey SelectAllFilterItems = new LanguageResourceKey("DataGrid.SelectAllFilterItems", "AtomUI.Lang"); - } -} \ No newline at end of file diff --git a/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs b/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs deleted file mode 100644 index 2fceca29e..000000000 --- a/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/ControlTokenTypePool.g.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections.Generic; -using AtomUI.Theme; - -namespace AtomUI.Theme -{ - internal class ControlTokenTypePool - { - internal static IList GetTokenTypes() - { - List tokenTypes = new List(); - tokenTypes.Add(typeof(AtomUI.Controls.DataGridToken)); - return tokenTypes; - } - } -} \ No newline at end of file diff --git a/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs b/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs deleted file mode 100644 index d4751f940..000000000 --- a/src/AtomUI.Controls.DataGrid/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs +++ /dev/null @@ -1,83 +0,0 @@ -using AtomUI.Theme.TokenSystem; - -namespace AtomUI.Theme.Styling -{ - public static class DataGridTokenKey - { - public static readonly TokenResourceKey BodySortBg = new TokenResourceKey("DataGrid.BodySortBg"); - public static readonly TokenResourceKey BorderColor = new TokenResourceKey("DataGrid.BorderColor"); - public static readonly TokenResourceKey CellFontSize = new TokenResourceKey("DataGrid.CellFontSize"); - public static readonly TokenResourceKey CellFontSizeMD = new TokenResourceKey("DataGrid.CellFontSizeMD"); - public static readonly TokenResourceKey CellFontSizeSM = new TokenResourceKey("DataGrid.CellFontSizeSM"); - public static readonly TokenResourceKey CellPadding = new TokenResourceKey("DataGrid.CellPadding"); - public static readonly TokenResourceKey CellPaddingMD = new TokenResourceKey("DataGrid.CellPaddingMD"); - public static readonly TokenResourceKey CellPaddingSM = new TokenResourceKey("DataGrid.CellPaddingSM"); - public static readonly TokenResourceKey ColumnReorderActiveBg = new TokenResourceKey("DataGrid.ColumnReorderActiveBg"); - public static readonly TokenResourceKey ExpandIconBg = new TokenResourceKey("DataGrid.ExpandIconBg"); - public static readonly TokenResourceKey ExpandIconHalfInner = new TokenResourceKey("DataGrid.ExpandIconHalfInner"); - public static readonly TokenResourceKey ExpandIconMargin = new TokenResourceKey("DataGrid.ExpandIconMargin"); - public static readonly TokenResourceKey ExpandIconScale = new TokenResourceKey("DataGrid.ExpandIconScale"); - public static readonly TokenResourceKey ExpandIconSize = new TokenResourceKey("DataGrid.ExpandIconSize"); - public static readonly TokenResourceKey FilterDropdownBg = new TokenResourceKey("DataGrid.FilterDropdownBg"); - public static readonly TokenResourceKey FilterDropdownMenuBg = new TokenResourceKey("DataGrid.FilterDropdownMenuBg"); - public static readonly TokenResourceKey FilterIndicatorPadding = new TokenResourceKey("DataGrid.FilterIndicatorPadding"); - public static readonly TokenResourceKey FixedHeaderSortActiveBg = new TokenResourceKey("DataGrid.FixedHeaderSortActiveBg"); - public static readonly TokenResourceKey FooterBg = new TokenResourceKey("DataGrid.FooterBg"); - public static readonly TokenResourceKey FooterColor = new TokenResourceKey("DataGrid.FooterColor"); - public static readonly TokenResourceKey HeaderBg = new TokenResourceKey("DataGrid.HeaderBg"); - public static readonly TokenResourceKey HeaderBorderRadius = new TokenResourceKey("DataGrid.HeaderBorderRadius"); - public static readonly TokenResourceKey HeaderColor = new TokenResourceKey("DataGrid.HeaderColor"); - public static readonly TokenResourceKey HeaderFilterHoverBg = new TokenResourceKey("DataGrid.HeaderFilterHoverBg"); - public static readonly TokenResourceKey HeaderIconColor = new TokenResourceKey("DataGrid.HeaderIconColor"); - public static readonly TokenResourceKey HeaderIconHoverColor = new TokenResourceKey("DataGrid.HeaderIconHoverColor"); - public static readonly TokenResourceKey HeaderSortActiveBg = new TokenResourceKey("DataGrid.HeaderSortActiveBg"); - public static readonly TokenResourceKey HeaderSortHoverBg = new TokenResourceKey("DataGrid.HeaderSortHoverBg"); - public static readonly TokenResourceKey HeaderSplitColor = new TokenResourceKey("DataGrid.HeaderSplitColor"); - public static readonly TokenResourceKey LeftFrozenShadows = new TokenResourceKey("DataGrid.LeftFrozenShadows"); - public static readonly TokenResourceKey PaginationMargin = new TokenResourceKey("DataGrid.PaginationMargin"); - public static readonly TokenResourceKey RightFrozenShadows = new TokenResourceKey("DataGrid.RightFrozenShadows"); - public static readonly TokenResourceKey RowExpandedBg = new TokenResourceKey("DataGrid.RowExpandedBg"); - public static readonly TokenResourceKey RowHoverBg = new TokenResourceKey("DataGrid.RowHoverBg"); - public static readonly TokenResourceKey RowReorderIndicatorSize = new TokenResourceKey("DataGrid.RowReorderIndicatorSize"); - public static readonly TokenResourceKey RowSelectedBg = new TokenResourceKey("DataGrid.RowSelectedBg"); - public static readonly TokenResourceKey RowSelectedHoverBg = new TokenResourceKey("DataGrid.RowSelectedHoverBg"); - public static readonly TokenResourceKey SelectionColumnWidth = new TokenResourceKey("DataGrid.SelectionColumnWidth"); - public static readonly TokenResourceKey SortIconSize = new TokenResourceKey("DataGrid.SortIconSize"); - public static readonly TokenResourceKey SortIndicatorLayoutMargin = new TokenResourceKey("DataGrid.SortIndicatorLayoutMargin"); - public static readonly TokenResourceKey TableBg = new TokenResourceKey("DataGrid.TableBg"); - public static readonly TokenResourceKey TableBodySortBg = new TokenResourceKey("DataGrid.TableBodySortBg"); - public static readonly TokenResourceKey TableBorderColor = new TokenResourceKey("DataGrid.TableBorderColor"); - public static readonly TokenResourceKey TableExpandColumnWidth = new TokenResourceKey("DataGrid.TableExpandColumnWidth"); - public static readonly TokenResourceKey TableExpandedRowBg = new TokenResourceKey("DataGrid.TableExpandedRowBg"); - public static readonly TokenResourceKey TableExpandIconBg = new TokenResourceKey("DataGrid.TableExpandIconBg"); - public static readonly TokenResourceKey TableFilterButtonContainerMargin = new TokenResourceKey("DataGrid.TableFilterButtonContainerMargin"); - public static readonly TokenResourceKey TableFilterButtonLayoutSeparatorMargin = new TokenResourceKey("DataGrid.TableFilterButtonLayoutSeparatorMargin"); - public static readonly TokenResourceKey TableFilterButtonSpacing = new TokenResourceKey("DataGrid.TableFilterButtonSpacing"); - public static readonly TokenResourceKey TableFilterDropdownBg = new TokenResourceKey("DataGrid.TableFilterDropdownBg"); - public static readonly TokenResourceKey TableFilterDropdownHeight = new TokenResourceKey("DataGrid.TableFilterDropdownHeight"); - public static readonly TokenResourceKey TableFilterDropdownPadding = new TokenResourceKey("DataGrid.TableFilterDropdownPadding"); - public static readonly TokenResourceKey TableFilterDropdownSearchWidth = new TokenResourceKey("DataGrid.TableFilterDropdownSearchWidth"); - public static readonly TokenResourceKey TableFilterDropdownWidth = new TokenResourceKey("DataGrid.TableFilterDropdownWidth"); - public static readonly TokenResourceKey TableFixedHeaderSortActiveBg = new TokenResourceKey("DataGrid.TableFixedHeaderSortActiveBg"); - public static readonly TokenResourceKey TableFontSize = new TokenResourceKey("DataGrid.TableFontSize"); - public static readonly TokenResourceKey TableFontSizeMiddle = new TokenResourceKey("DataGrid.TableFontSizeMiddle"); - public static readonly TokenResourceKey TableFontSizeSmall = new TokenResourceKey("DataGrid.TableFontSizeSmall"); - public static readonly TokenResourceKey TableFooterBg = new TokenResourceKey("DataGrid.TableFooterBg"); - public static readonly TokenResourceKey TableFooterTextColor = new TokenResourceKey("DataGrid.TableFooterTextColor"); - public static readonly TokenResourceKey TableHeaderBg = new TokenResourceKey("DataGrid.TableHeaderBg"); - public static readonly TokenResourceKey TableHeaderCellSplitColor = new TokenResourceKey("DataGrid.TableHeaderCellSplitColor"); - public static readonly TokenResourceKey TableHeaderFilterActiveBg = new TokenResourceKey("DataGrid.TableHeaderFilterActiveBg"); - public static readonly TokenResourceKey TableHeaderSortBg = new TokenResourceKey("DataGrid.TableHeaderSortBg"); - public static readonly TokenResourceKey TableHeaderSortHoverBg = new TokenResourceKey("DataGrid.TableHeaderSortHoverBg"); - public static readonly TokenResourceKey TableHeaderTextColor = new TokenResourceKey("DataGrid.TableHeaderTextColor"); - public static readonly TokenResourceKey TablePadding = new TokenResourceKey("DataGrid.TablePadding"); - public static readonly TokenResourceKey TablePaddingMiddle = new TokenResourceKey("DataGrid.TablePaddingMiddle"); - public static readonly TokenResourceKey TablePaddingSmall = new TokenResourceKey("DataGrid.TablePaddingSmall"); - public static readonly TokenResourceKey TableRadius = new TokenResourceKey("DataGrid.TableRadius"); - public static readonly TokenResourceKey TableRowHoverBg = new TokenResourceKey("DataGrid.TableRowHoverBg"); - public static readonly TokenResourceKey TableSelectedRowBg = new TokenResourceKey("DataGrid.TableSelectedRowBg"); - public static readonly TokenResourceKey TableSelectedRowHoverBg = new TokenResourceKey("DataGrid.TableSelectedRowHoverBg"); - public static readonly TokenResourceKey TableSelectionColumnWidth = new TokenResourceKey("DataGrid.TableSelectionColumnWidth"); - public static readonly TokenResourceKey TableTopLeftColumnCornerRadius = new TokenResourceKey("DataGrid.TableTopLeftColumnCornerRadius"); - } -} \ No newline at end of file diff --git a/src/AtomUI.Controls.DataGrid/Localization/en_US.cs b/src/AtomUI.Controls.DataGrid/Localization/en_US.cs index 40f2e7610..e3ad00016 100644 --- a/src/AtomUI.Controls.DataGrid/Localization/en_US.cs +++ b/src/AtomUI.Controls.DataGrid/Localization/en_US.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; namespace AtomUI.Controls.DataGridLocalization; diff --git a/src/AtomUI.Controls.DataGrid/Localization/zh_CN.cs b/src/AtomUI.Controls.DataGrid/Localization/zh_CN.cs index b7982233b..569f8e0e8 100644 --- a/src/AtomUI.Controls.DataGrid/Localization/zh_CN.cs +++ b/src/AtomUI.Controls.DataGrid/Localization/zh_CN.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; namespace AtomUI.Controls.DataGridLocalization; diff --git a/src/AtomUI.Controls.DataGrid/ThemeManagerBuilderExtensions.cs b/src/AtomUI.Controls.DataGrid/ThemeManagerBuilderExtensions.cs index 4dd079689..a8af8c612 100644 --- a/src/AtomUI.Controls.DataGrid/ThemeManagerBuilderExtensions.cs +++ b/src/AtomUI.Controls.DataGrid/ThemeManagerBuilderExtensions.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; namespace AtomUI.Controls; diff --git a/src/AtomUI.Controls/DatePicker/Localization/en_US.cs b/src/AtomUI.Controls/DatePicker/Localization/en_US.cs index 77f01a3ba..4e240bf9c 100644 --- a/src/AtomUI.Controls/DatePicker/Localization/en_US.cs +++ b/src/AtomUI.Controls/DatePicker/Localization/en_US.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; namespace AtomUI.Controls.DatePickerLang; diff --git a/src/AtomUI.Controls/DatePicker/Localization/zh_CN.cs b/src/AtomUI.Controls/DatePicker/Localization/zh_CN.cs index 475f497c3..341deea9d 100644 --- a/src/AtomUI.Controls/DatePicker/Localization/zh_CN.cs +++ b/src/AtomUI.Controls/DatePicker/Localization/zh_CN.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; namespace AtomUI.Controls.DatePickerLang; diff --git a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs index 878b7a74f..9de610c85 100644 --- a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs +++ b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using AtomUI.Theme; +using AtomUI.Theme.Language; -namespace AtomUI.Theme +namespace AtomUI.Theme.Language { internal class LanguageProviderPool { diff --git a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs index d12af12f7..693d7dc5f 100644 --- a/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs +++ b/src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; namespace AtomUI.Controls.DatePickerLang { diff --git a/src/AtomUI.Controls/Localization/en_US.cs b/src/AtomUI.Controls/Localization/en_US.cs index 460865cea..0903e3423 100644 --- a/src/AtomUI.Controls/Localization/en_US.cs +++ b/src/AtomUI.Controls/Localization/en_US.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; // ReSharper disable once CheckNamespace diff --git a/src/AtomUI.Controls/Localization/zh_CN.cs b/src/AtomUI.Controls/Localization/zh_CN.cs index e4539aa48..6376804f2 100644 --- a/src/AtomUI.Controls/Localization/zh_CN.cs +++ b/src/AtomUI.Controls/Localization/zh_CN.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; // ReSharper disable once CheckNamespace diff --git a/src/AtomUI.Controls/Pagination/Localization/en_US.cs b/src/AtomUI.Controls/Pagination/Localization/en_US.cs index 1affacb8f..2282d9a67 100644 --- a/src/AtomUI.Controls/Pagination/Localization/en_US.cs +++ b/src/AtomUI.Controls/Pagination/Localization/en_US.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; namespace AtomUI.Controls.PaginationLang; diff --git a/src/AtomUI.Controls/Pagination/Localization/zh_CN.cs b/src/AtomUI.Controls/Pagination/Localization/zh_CN.cs index 02ef3ccf6..2378dbf0e 100644 --- a/src/AtomUI.Controls/Pagination/Localization/zh_CN.cs +++ b/src/AtomUI.Controls/Pagination/Localization/zh_CN.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; namespace AtomUI.Controls.PaginationLang; diff --git a/src/AtomUI.Controls/PopupConfirm/Localization/en_US.cs b/src/AtomUI.Controls/PopupConfirm/Localization/en_US.cs index 60c6ff33e..8eb930fd2 100644 --- a/src/AtomUI.Controls/PopupConfirm/Localization/en_US.cs +++ b/src/AtomUI.Controls/PopupConfirm/Localization/en_US.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; namespace AtomUI.Controls.PopupConfirmLang; diff --git a/src/AtomUI.Controls/PopupConfirm/Localization/zh_CN.cs b/src/AtomUI.Controls/PopupConfirm/Localization/zh_CN.cs index 63c2b76bb..cff825efb 100644 --- a/src/AtomUI.Controls/PopupConfirm/Localization/zh_CN.cs +++ b/src/AtomUI.Controls/PopupConfirm/Localization/zh_CN.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; namespace AtomUI.Controls.PopupConfirmLang; diff --git a/src/AtomUI.Controls/ThemeManagerBuilderExtensions.cs b/src/AtomUI.Controls/ThemeManagerBuilderExtensions.cs index 467971cf8..9f858c74a 100644 --- a/src/AtomUI.Controls/ThemeManagerBuilderExtensions.cs +++ b/src/AtomUI.Controls/ThemeManagerBuilderExtensions.cs @@ -1,6 +1,7 @@ using AtomUI.Controls.Utils; using AtomUI.MotionScene; using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Theme.Data; using AtomUI.Theme.Styling; using Avalonia; diff --git a/src/AtomUI.Controls/TimePicker/Localization/en_US.cs b/src/AtomUI.Controls/TimePicker/Localization/en_US.cs index 990c0694d..34fb85b43 100644 --- a/src/AtomUI.Controls/TimePicker/Localization/en_US.cs +++ b/src/AtomUI.Controls/TimePicker/Localization/en_US.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; // ReSharper disable once CheckNamespace diff --git a/src/AtomUI.Controls/TimePicker/Localization/zh_CN.cs b/src/AtomUI.Controls/TimePicker/Localization/zh_CN.cs index 23554c574..a547cbb1e 100644 --- a/src/AtomUI.Controls/TimePicker/Localization/zh_CN.cs +++ b/src/AtomUI.Controls/TimePicker/Localization/zh_CN.cs @@ -1,4 +1,5 @@ using AtomUI.Theme; +using AtomUI.Theme.Language; using AtomUI.Utils; // ReSharper disable once CheckNamespace diff --git a/src/AtomUI.Generator/Language/LangResourceKeyClassSourceWriter.cs b/src/AtomUI.Generator/Language/LangResourceKeyClassSourceWriter.cs index cde95cbcc..538c03bcc 100644 --- a/src/AtomUI.Generator/Language/LangResourceKeyClassSourceWriter.cs +++ b/src/AtomUI.Generator/Language/LangResourceKeyClassSourceWriter.cs @@ -39,6 +39,7 @@ public class LangResourceKeyClassSourceWriter private void SetupUsingInfos() { _usingInfos.Add("AtomUI.Theme"); + _usingInfos.Add("AtomUI.Theme.Language"); } public void Write() diff --git a/src/AtomUI.Generator/Language/LanguageProviderPoolClassSourceWriter.cs b/src/AtomUI.Generator/Language/LanguageProviderPoolClassSourceWriter.cs index 783ad50a2..b5afd009c 100644 --- a/src/AtomUI.Generator/Language/LanguageProviderPoolClassSourceWriter.cs +++ b/src/AtomUI.Generator/Language/LanguageProviderPoolClassSourceWriter.cs @@ -24,6 +24,7 @@ public class LanguageProviderPoolClassSourceWriter { _usingInfos.Add("System.Collections.Generic"); _usingInfos.Add("AtomUI.Theme"); + _usingInfos.Add("AtomUI.Theme.Language"); } public void Write() @@ -51,7 +52,7 @@ public class LanguageProviderPoolClassSourceWriter compilationUnit = compilationUnit.AddUsings(usingSyntaxList.ToArray()); // 添加命名空间 - var namespaceSyntax = SyntaxFactory.NamespaceDeclaration(SyntaxFactory.ParseName("AtomUI.Theme")); + var namespaceSyntax = SyntaxFactory.NamespaceDeclaration(SyntaxFactory.ParseName("AtomUI.Theme.Language")); var languageProviderPoolClassDecl = SyntaxFactory.ClassDeclaration("LanguageProviderPool") .AddModifiers(SyntaxFactory.Token(SyntaxKind.InternalKeyword)) diff --git a/src/AtomUI.Generator/TargetMarkConstants.cs b/src/AtomUI.Generator/TargetMarkConstants.cs index f424a03ac..ce8c72096 100644 --- a/src/AtomUI.Generator/TargetMarkConstants.cs +++ b/src/AtomUI.Generator/TargetMarkConstants.cs @@ -2,7 +2,7 @@ public static class TargetMarkConstants { - public const string LanguageProviderAttribute = "AtomUI.Theme.LanguageProviderAttribute"; + public const string LanguageProviderAttribute = "AtomUI.Theme.Language.LanguageProviderAttribute"; public const string GlobalDesignTokenAttribute = "AtomUI.Theme.TokenSystem.GlobalDesignTokenAttribute"; public const string ControlDesignTokenAttribute = "AtomUI.Theme.TokenSystem.ControlDesignTokenAttribute"; public const string ControlThemeProviderAttribute = "AtomUI.Theme.Styling.ControlThemeProviderAttribute"; diff --git a/src/AtomUI.Theme/AbstractLanguageProvider.cs b/src/AtomUI.Theme/AbstractLanguageProvider.cs index 2368dc8f1..0b370aaad 100644 --- a/src/AtomUI.Theme/AbstractLanguageProvider.cs +++ b/src/AtomUI.Theme/AbstractLanguageProvider.cs @@ -1,4 +1,5 @@ using System.Reflection; +using AtomUI.Theme.Language; using Avalonia.Controls; namespace AtomUI.Theme; diff --git a/src/AtomUI.Theme/Data/LanguageResourceBinder.cs b/src/AtomUI.Theme/Data/LanguageResourceBinder.cs index e0c050274..5d98ccf78 100644 --- a/src/AtomUI.Theme/Data/LanguageResourceBinder.cs +++ b/src/AtomUI.Theme/Data/LanguageResourceBinder.cs @@ -1,4 +1,5 @@ -using Avalonia; +using AtomUI.Theme.Language; +using Avalonia; using Avalonia.Controls; using Avalonia.Data; using Avalonia.Styling; diff --git a/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs b/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs index ff0468041..1533a48ce 100644 --- a/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs +++ b/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageProviderPool.g.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using AtomUI.Theme; +using AtomUI.Theme.Language; -namespace AtomUI.Theme +namespace AtomUI.Theme.Language { internal class LanguageProviderPool { diff --git a/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs b/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs index 0dc1a2a00..738911208 100644 --- a/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs +++ b/src/AtomUI.Theme/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.LanguageGenerator/LanguageResourceConst.g.cs @@ -1 +1,2 @@ -using AtomUI.Theme; \ No newline at end of file +using AtomUI.Theme; +using AtomUI.Theme.Language; \ No newline at end of file diff --git a/src/AtomUI.Theme/ILanguageProvider.cs b/src/AtomUI.Theme/Language/ILanguageProvider.cs similarity index 88% rename from src/AtomUI.Theme/ILanguageProvider.cs rename to src/AtomUI.Theme/Language/ILanguageProvider.cs index 449ef54a6..d9f1292ef 100644 --- a/src/AtomUI.Theme/ILanguageProvider.cs +++ b/src/AtomUI.Theme/Language/ILanguageProvider.cs @@ -1,6 +1,6 @@ using Avalonia.Controls; -namespace AtomUI.Theme; +namespace AtomUI.Theme.Language; public interface ILanguageProvider { diff --git a/src/AtomUI.Theme/LanguageProviderAttribute.cs b/src/AtomUI.Theme/Language/LanguageProviderAttribute.cs similarity index 95% rename from src/AtomUI.Theme/LanguageProviderAttribute.cs rename to src/AtomUI.Theme/Language/LanguageProviderAttribute.cs index ccc76c105..3eb4d74ba 100644 --- a/src/AtomUI.Theme/LanguageProviderAttribute.cs +++ b/src/AtomUI.Theme/Language/LanguageProviderAttribute.cs @@ -1,4 +1,4 @@ -namespace AtomUI.Theme; +namespace AtomUI.Theme.Language; [AttributeUsage(AttributeTargets.Class, Inherited = false)] public class LanguageProviderAttribute : Attribute diff --git a/src/AtomUI.Theme/LanguageResourceKey.cs b/src/AtomUI.Theme/Language/LanguageResourceKey.cs similarity index 97% rename from src/AtomUI.Theme/LanguageResourceKey.cs rename to src/AtomUI.Theme/Language/LanguageResourceKey.cs index d0127ff1d..c42c9d11b 100644 --- a/src/AtomUI.Theme/LanguageResourceKey.cs +++ b/src/AtomUI.Theme/Language/LanguageResourceKey.cs @@ -1,4 +1,4 @@ -namespace AtomUI.Theme; +namespace AtomUI.Theme.Language; public readonly struct LanguageResourceKey : IEquatable { diff --git a/src/AtomUI.Theme/Theme.cs b/src/AtomUI.Theme/Theme.cs index c13798b17..dfbf26665 100644 --- a/src/AtomUI.Theme/Theme.cs +++ b/src/AtomUI.Theme/Theme.cs @@ -1,6 +1,5 @@ using System.Diagnostics; using System.Reflection; -using System.Text; using AtomUI.Theme.Styling; using AtomUI.Theme.TokenSystem; using Avalonia; diff --git a/src/AtomUI.Theme/ThemeManager.cs b/src/AtomUI.Theme/ThemeManager.cs index 64b9746ce..f1ecfb4d6 100644 --- a/src/AtomUI.Theme/ThemeManager.cs +++ b/src/AtomUI.Theme/ThemeManager.cs @@ -1,5 +1,6 @@ using System.Diagnostics; using System.Globalization; +using AtomUI.Theme.Language; using Avalonia; using Avalonia.Controls; using Avalonia.Platform;