重构命名控件

Samples/AtomUI.Demo.Desktop/Program.cs

@@ -1,5 +1,6 @@
 using AtomUI.Icon;
 using AtomUI.Icon.AntDesign;
+using AtomUI.Theme;
 using Avalonia;
 using Avalonia.Dialogs;
 using Avalonia.Media;

Samples/AtomUI.Demo.Desktop/ViewModels/PaletteDemoViewModel.cs

@@ -1,5 +1,5 @@
 using System.Collections.ObjectModel;
-using AtomUI.Palette;
+using AtomUI.Theme.Palette;
 using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;

src/AtomUI.Base/Media/BoxShadowExtensions.cs

@@ -1,6 +1,5 @@
 using Avalonia;
 using Avalonia.Media;
-using Math = System.Math;
 
 namespace AtomUI.Media;
 

src/AtomUI.Base/Media/PixelPointTransition.cs

@@ -1,5 +1,4 @@
-using AtomUI.Utils;
+using Avalonia;
-using Avalonia;
 using Avalonia.Animation;
 
 namespace AtomUI.Media;

src/AtomUI.Base/MotionScene/MoveMotion.cs

@@ -1,8 +1,6 @@
 using Avalonia;
 using Avalonia.Animation.Easings;
 using Avalonia.Controls;
-using Avalonia.Media;
-using Avalonia.Media.Transformation;
 
 namespace AtomUI.MotionScene;
 

src/AtomUI.Base/Reflection/TypeExtension.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using Avalonia.Controls;
 
 namespace AtomUI.Reflection;
 

src/AtomUI.Controls/Alert/Alert.cs

@@ -1,5 +1,5 @@
-using AtomUI.Data;
+using AtomUI.Theme.Data;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/Alert/AlertTheme.cs

@@ -1,5 +1,6 @@
 using AtomUI.Data;
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;
@@ -16,7 +17,7 @@ using VerticalAlignment = Avalonia.Layout.VerticalAlignment;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class AlertTheme : ControlTheme
+internal class AlertTheme : BaseControlTheme
 {
    public const string CloseBtnPart = "PART_CloseBtn";
    public const string InfoIconPart = "PART_InfoIcon";

src/AtomUI.Controls/Alert/AlertToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 
 namespace AtomUI.Controls;

src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBox.cs

@@ -1,5 +1,5 @@
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBoxTheme.cs

@@ -1,17 +1,15 @@
 using AtomUI.Controls.Utils;
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Avalonia.Media;
 using Avalonia.Styling;
-using ExCSS;
-using Colors = Avalonia.Media.Colors;
 
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class ArrowDecoratedBoxTheme : ControlTheme
+public class ArrowDecoratedBoxTheme : BaseControlTheme
 {
    public const string DecoratorPart = "Part_Decorator";
    

src/AtomUI.Controls/ArrowDecoratedBox/ArrowDecoratedBoxToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 
 namespace AtomUI.Controls;

src/AtomUI.Controls/Badge/BadgeToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 using Avalonia.Media;
 

src/AtomUI.Controls/Badge/CountBadge.cs

@@ -2,8 +2,8 @@
 using AtomUI.Controls.MotionScene;
 using AtomUI.Data;
 using AtomUI.MotionScene;
-using AtomUI.Palette;
+using AtomUI.Theme.Palette;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/Badge/CountBadgeAdorner.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Documents;

src/AtomUI.Controls/Badge/DotBadge.cs

@@ -2,8 +2,8 @@
 using AtomUI.Controls.MotionScene;
 using AtomUI.Data;
 using AtomUI.MotionScene;
-using AtomUI.Palette;
+using AtomUI.Theme.Palette;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/Badge/DotBadgeAdorner.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Layout;

src/AtomUI.Controls/Badge/RibbonBadge.cs

@@ -1,6 +1,6 @@
 using AtomUI.Data;
-using AtomUI.Palette;
+using AtomUI.Theme.Palette;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;

src/AtomUI.Controls/Badge/RibbonBadgeAdorner.cs

@@ -1,6 +1,6 @@
 using AtomUI.Controls.Utils;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Layout;

src/AtomUI.Controls/Buttons/BaseButtonTheme.cs

@@ -1,8 +1,8 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Markup.Xaml.MarkupExtensions;
@@ -10,7 +10,7 @@ using Avalonia.Styling;
 
 namespace AtomUI.Controls;
 
-internal abstract class BaseButtonTheme : ControlTheme
+internal abstract class BaseButtonTheme : BaseControlTheme
 {
    public const string LabelPart = "PART_Label";
    public const string StackPanelPart = "PART_StackPanel";

src/AtomUI.Controls/Buttons/Button.cs

@@ -1,7 +1,8 @@
 using AtomUI.Controls.Utils;
 using AtomUI.Icon;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
+using AtomUI.Theme.Utils;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Animation;

src/AtomUI.Controls/Buttons/ButtonToken.cs

@@ -1,5 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Media;

src/AtomUI.Controls/Buttons/DefaultButtonTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Styling;
 

src/AtomUI.Controls/Buttons/IconButton.cs

@@ -1,5 +1,5 @@
 using AtomUI.Icon;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Input;
 using Avalonia.LogicalTree;

src/AtomUI.Controls/Buttons/LinkButtonTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Styling;
 

src/AtomUI.Controls/Buttons/PrimaryButtonTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Media;
 using Avalonia.Styling;

src/AtomUI.Controls/Buttons/TextButtonTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Styling;
 

src/AtomUI.Controls/CheckBox/CheckBox.cs

@@ -1,7 +1,7 @@
 using AtomUI.Controls.Utils;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.Utils;
+using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Animation.Easings;

src/AtomUI.Controls/CheckBox/CheckBoxTheme.cs

@@ -1,11 +1,11 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
-using Avalonia.Markup.Xaml.MarkupExtensions;
+using AtomUI.Theme.Styling;
 using Avalonia.Styling;
 
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class CheckBoxTheme : ControlTheme
+internal class CheckBoxTheme : BaseControlTheme
 {
    public CheckBoxTheme()
       : base(typeof(CheckBox))

src/AtomUI.Controls/CheckBox/CheckBoxToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 
 namespace AtomUI.Controls;
 

src/AtomUI.Controls/EmptyIndicator/EmptyIndicator.cs

@@ -1,5 +1,5 @@
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/EmptyIndicator/EmptyIndicatorTheme.cs

@@ -1,5 +1,6 @@
 using AtomUI.Data;
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;
@@ -12,7 +13,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class EmptyIndicatorTheme : ControlTheme
+internal class EmptyIndicatorTheme : BaseControlTheme
 {
    public const string SvgImagePart = "PART_SvgImage";
    

src/AtomUI.Controls/EmptyIndicator/EmptyIndicatorToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 
 namespace AtomUI.Controls;
 

src/AtomUI.Controls/Flyouts/Flyout.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Reactive.Disposables;
 using AtomUI.Data;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;
@@ -9,6 +9,7 @@ using Avalonia.Controls.Primitives.PopupPositioning;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Metadata;
+using Avalonia.Styling;
 using Avalonia.Threading;
 
 namespace AtomUI.Controls;

src/AtomUI.Controls/Flyouts/FlyoutHost.cs

@@ -1,6 +1,6 @@
 using System.Reactive.Disposables;
 using AtomUI.Data;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/Flyouts/FlyoutPresenterToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 
 namespace AtomUI.Controls;
 

src/AtomUI.Controls/Flyouts/MenuFlyout.cs

@@ -5,11 +5,10 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Metadata;
+using Avalonia.Styling;
 
 namespace AtomUI.Controls;
 
-using AvaloniaControlTheme = Avalonia.Styling.ControlTheme;
-
 public class MenuFlyout : PopupFlyoutBase
 {
    private static readonly MethodInfo SetItemsSourceMethodInfo;
@@ -41,7 +40,7 @@ public class MenuFlyout : PopupFlyoutBase
    /// <summary>
    /// Defines the <see cref="ItemContainerTheme"/> property.
    /// </summary>
-   public static readonly StyledProperty<AvaloniaControlTheme?> ItemContainerThemeProperty =
+   public static readonly StyledProperty<ControlTheme?> ItemContainerThemeProperty =
       ItemsControl.ItemContainerThemeProperty.AddOwner<MenuFlyout>();
 
    /// <summary>
@@ -75,7 +74,7 @@ public class MenuFlyout : PopupFlyoutBase
    /// <summary>
    /// Gets or sets the <see cref="ControlTheme"/> that is applied to the container element generated for each item.
    /// </summary>
-   public AvaloniaControlTheme? ItemContainerTheme
+   public ControlTheme? ItemContainerTheme
    {
       get => GetValue(ItemContainerThemeProperty);
       set => SetValue(ItemContainerThemeProperty, value);
@@ -84,7 +83,7 @@ public class MenuFlyout : PopupFlyoutBase
    /// <summary>
    /// Gets or sets the <see cref="ControlTheme"/> that is applied to the container element generated for the flyout presenter.
    /// </summary>
-   public AvaloniaControlTheme? FlyoutPresenterTheme
+   public ControlTheme? FlyoutPresenterTheme
    {
       get => GetValue(FlyoutPresenterThemeProperty);
       set => SetValue(FlyoutPresenterThemeProperty, value);

src/AtomUI.Controls/Flyouts/MenuFlyoutPresenterTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -9,7 +10,7 @@ using Avalonia.Media;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class MenuFlyoutPresenterTheme : ControlTheme
+public class MenuFlyoutPresenterTheme : BaseControlTheme
 {
    public const string ItemsPresenterPart  = "PART_ItemsPresenter";
    public const string RootContainerPart   = "PART_RootContainer";

src/AtomUI.Controls/GeneratedFiles/AtomUI.Generator/AtomUI.Generator.TokenResourceKeyGenerator/TokenResourceConst.g.cs

@@ -1,6 +1,6 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 
-namespace AtomUI.Styling
+namespace AtomUI.Theme.Styling
 {
     public static class AlertResourceKey
     {

src/AtomUI.Controls/Loading/LoadingIndicator.cs

@@ -1,5 +1,5 @@
 using AtomUI.Controls.Utils;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Animation;

src/AtomUI.Controls/Loading/LoadingIndicatorAdorner.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;

src/AtomUI.Controls/Loading/LoadingIndicatorAdornerTheme.cs

@@ -1,11 +1,12 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class LoadingIndicatorAdornerTheme : ControlTheme
+public class LoadingIndicatorAdornerTheme : BaseControlTheme
 {
    public const string LoadingIndicatorPart = "Part_LoadingIndicator";
    public const string MainContainerPart = "Part_MainContainer";

src/AtomUI.Controls/Loading/LoadingIndicatorTheme.cs

@@ -1,5 +1,6 @@
 using AtomUI.Icon;
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia.Animation.Easings;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
@@ -9,7 +10,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class LoadingIndicatorTheme : ControlTheme
+public class LoadingIndicatorTheme : BaseControlTheme
 {
    public const string MainContainerPart = "Part_MainContainer";
    public const string LoadingTextPart = "Part_LoadingText";

src/AtomUI.Controls/Loading/LoadingIndicatorToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 
 namespace AtomUI.Controls;
 

src/AtomUI.Controls/Loading/LoadingMaskHost.cs

@@ -1,5 +1,5 @@
 using AtomUI.Data;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Animation.Easings;
 using Avalonia.Controls;

src/AtomUI.Controls/MarqueeLabel/MarqueeLabel.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Animation;

src/AtomUI.Controls/MarqueeLabel/MarqueeLabelToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 
 namespace AtomUI.Controls;
 

src/AtomUI.Controls/Menu/ContextMenu.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Reflection;
 using AtomUI.Reflection;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;

src/AtomUI.Controls/Menu/ContextMenuTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -9,7 +10,7 @@ using Avalonia.Media;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class ContextMenuTheme : ControlTheme
+public class ContextMenuTheme : BaseControlTheme
 {
    public const string ItemsPresenterPart  = "PART_ItemsPresenter";
    public const string RootContainerPart   = "PART_RootContainer";

src/AtomUI.Controls/Menu/MenuItem.cs

@@ -1,6 +1,7 @@
 using AtomUI.Data;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
+using AtomUI.Theme.Utils;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Animation;

src/AtomUI.Controls/Menu/MenuItemTheme.cs

@@ -1,12 +1,13 @@
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
+using AtomUI.Theme.Utils;
 using AtomUI.Utils;
 using Avalonia.Animation;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.Media;
 using Avalonia.Styling;
@@ -14,7 +15,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class MenuItemTheme : ControlTheme
+internal class MenuItemTheme : BaseControlTheme
 {
    public const string ItemDecoratorPart     = "Part_ItemDecorator";
    public const string MainContainerPart     = "Part_MainContainer";

src/AtomUI.Controls/Menu/MenuScrollViewer.cs

@@ -1,5 +1,5 @@
 using System.Globalization;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Converters;

src/AtomUI.Controls/Menu/MenuScrollViewerTheme.cs

@@ -1,6 +1,8 @@
 using AtomUI.Data;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
+using AtomUI.Theme.Utils;
 using AtomUI.Utils;
 using Avalonia.Animation;
 using Avalonia.Controls;
@@ -13,7 +15,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class MenuScrollViewerTheme : ControlTheme
+internal class MenuScrollViewerTheme : BaseControlTheme
 {
    public const string ScrollUpButtonPart = "Part_ScrollUpButton";
    public const string ScrollDownButtonPart = "Part_ScrollDownButton";

src/AtomUI.Controls/Menu/MenuSeparator.cs

@@ -1,11 +1,8 @@
-using AtomUI.Data;
+using AtomUI.Theme.Data;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
-using Avalonia.Controls.Primitives;
-using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.LogicalTree;
 using Avalonia.Media;
 
 namespace AtomUI.Controls;

src/AtomUI.Controls/Menu/MenuSeparatorTheme.cs

@@ -1,12 +1,11 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
-using Avalonia.Controls;
+using AtomUI.Theme.Styling;
-using Avalonia.Controls.Templates;
 using Avalonia.Styling;
 
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class MenuSeparatorTheme : ControlTheme
+public class MenuSeparatorTheme : BaseControlTheme
 {
    public MenuSeparatorTheme()
       : base(typeof(MenuSeparator))

src/AtomUI.Controls/Menu/MenuTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -10,7 +11,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class MenuTheme : ControlTheme
+public class MenuTheme : BaseControlTheme
 {
    public const string ItemsPresenterPart = "PART_ItemsPresenter";
    public MenuTheme()

src/AtomUI.Controls/Menu/MenuToken.cs

@@ -1,5 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 using Avalonia.Media;
 

src/AtomUI.Controls/Menu/TopLevelMenuItemTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -11,7 +12,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class TopLevelMenuItemTheme : ControlTheme
+public class TopLevelMenuItemTheme : BaseControlTheme
 {
    public const string ID = "TopLevelMenuItem";
    

src/AtomUI.Controls/OptionButtonBox/OptionButton.cs

@@ -1,7 +1,7 @@
 using AtomUI.Controls.Utils;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.Utils;
+using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Controls;

src/AtomUI.Controls/OptionButtonBox/OptionButtonGroup.cs

@@ -1,6 +1,6 @@
 using System.Collections.Specialized;
 using AtomUI.Controls.Utils;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;

src/AtomUI.Controls/OptionButtonBox/OptionButtonGroupTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
@@ -7,7 +8,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class OptionButtonGroupTheme : ControlTheme
+public class OptionButtonGroupTheme : BaseControlTheme
 {
    public const string MainContainerPart = "PART_MainContainer";
    

src/AtomUI.Controls/OptionButtonBox/OptionButtonTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
@@ -8,7 +9,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class OptionButtonTheme : ControlTheme
+public class OptionButtonTheme : BaseControlTheme
 {
    public OptionButtonTheme()
       : base(typeof(OptionButton))

src/AtomUI.Controls/OptionButtonBox/OptionButtonToken.cs

@@ -1,5 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Media;

src/AtomUI.Controls/Popup/Popup.cs

@@ -2,7 +2,7 @@
 using AtomUI.Controls.MotionScene;
 using AtomUI.Data;
 using AtomUI.MotionScene;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/ProgressBar/AbstractCircleProgress.cs

@@ -1,5 +1,5 @@
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/ProgressBar/AbstractCircleProgressTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;

src/AtomUI.Controls/ProgressBar/AbstractLineProgress.cs

@@ -1,5 +1,5 @@
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/ProgressBar/AbstractLineProgressTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;

src/AtomUI.Controls/ProgressBar/AbstractProgressBar.cs

@@ -1,5 +1,6 @@
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
+using AtomUI.Theme.Utils;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Animation;
@@ -8,7 +9,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
-using Avalonia.LogicalTree;
 using Avalonia.Media;
 
 namespace AtomUI.Controls;

src/AtomUI.Controls/ProgressBar/AbstractProgressBarTheme.cs

@@ -1,5 +1,6 @@
 using AtomUI.Icon;
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
@@ -9,7 +10,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 
-public class AbstractProgressBarTheme : ControlTheme
+public class AbstractProgressBarTheme : BaseControlTheme
 {
    public const string PercentageLabelPart = "PART_PercentageLabel";
    public const string SuccessCompletedIconPart = "PART_SuccessCompletedIcon";

src/AtomUI.Controls/ProgressBar/CircleProgressTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 
 namespace AtomUI.Controls;
 

src/AtomUI.Controls/ProgressBar/DashboardProgressTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 
 namespace AtomUI.Controls;
 

src/AtomUI.Controls/ProgressBar/ProgressBar.cs

@@ -1,6 +1,6 @@
-using AtomUI.Data;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Data;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/ProgressBar/ProgressBarTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Layout;
 using Avalonia.Media;

src/AtomUI.Controls/ProgressBar/ProgressBarToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 using Avalonia.Media;
 

src/AtomUI.Controls/ProgressBar/StepsProgressBar.cs

@@ -1,5 +1,5 @@
-using AtomUI.Data;
+using AtomUI.Theme.Data;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/ProgressBar/StepsProgressBarTheme.cs

@@ -1,4 +1,4 @@
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using Avalonia.Layout;
 using Avalonia.Styling;
 

src/AtomUI.Controls/RadioButton/RadioButton.cs

@@ -1,7 +1,7 @@
 using AtomUI.Controls.Utils;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.Utils;
+using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Controls;

src/AtomUI.Controls/RadioButton/RadioButtonTheme.cs

@@ -1,11 +1,11 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
-using Avalonia.Markup.Xaml.MarkupExtensions;
+using AtomUI.Theme.Styling;
 using Avalonia.Styling;
 
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class RadioButtonTheme : ControlTheme
+internal class RadioButtonTheme : BaseControlTheme
 {
    public RadioButtonTheme()
       : base(typeof(RadioButton))

src/AtomUI.Controls/RadioButton/RadioButtonToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia.Media;
 
 namespace AtomUI.Controls;

src/AtomUI.Controls/Segmented/Segmented.cs

@@ -1,7 +1,7 @@
 using System.Collections.Specialized;
 using AtomUI.Data;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.Utils;
+using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Collections;

src/AtomUI.Controls/Segmented/SegmentedItem.cs

@@ -1,7 +1,8 @@
 using AtomUI.Controls.Utils;
 using AtomUI.Icon;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
+using AtomUI.Theme.Utils;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Animation;

src/AtomUI.Controls/Segmented/SegmentedItemBox.cs

@@ -1,7 +1,7 @@
 using AtomUI.Data;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.Utils;
+using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Controls;
@@ -15,11 +15,12 @@ namespace AtomUI.Controls;
 /// 在内部维护一些额外信息的控件，用户无感知
 /// 绘制圆角什么的
 /// </summary>
-internal partial class SegmentedItemBox : TemplatedControl, 
+internal class SegmentedItemBox : TemplatedControl,
                                   ICustomHitTest,
                                   IControlCustomStyle
 {
    #region 公共属性定义
+
    public static readonly StyledProperty<SizeType> SizeTypeProperty =
       Segmented.SizeTypeProperty.AddOwner<SegmentedItemBox>();
 
@@ -77,12 +78,19 @@ internal partial class SegmentedItemBox : TemplatedControl,
       get => GetValue(TrackPaddingProperty);
       set => SetValue(TrackPaddingProperty, value);
    }
+
    #endregion
 
    internal Control Item { get; }
 
    private bool _isCurrentItem;
-   internal bool IsCurrentItem { get => _isCurrentItem; set => SetCurrentItem(value); }
+
+   internal bool IsCurrentItem
+   {
+      get => _isCurrentItem;
+      set => SetCurrentItem(value);
+   }
+
    private IControlCustomStyle _customStyle;
    private bool _isPressed = false;
    private ControlStyleState _styleState;
@@ -228,5 +236,6 @@ internal partial class SegmentedItemBox : TemplatedControl,
       PseudoClasses.Set(StdPseudoClass.Pressed, IsPressed);
       PseudoClasses.Set(StdPseudoClass.Selected, IsCurrentItem);
    }
+
    #endregion
 }

src/AtomUI.Controls/Segmented/SegmentedItemBoxTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Styling;
@@ -6,7 +7,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class SegmentedItemBoxTheme : ControlTheme
+public class SegmentedItemBoxTheme : BaseControlTheme
 {
    public SegmentedItemBoxTheme()
       : base(typeof(SegmentedItemBox))

src/AtomUI.Controls/Segmented/SegmentedItemTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
@@ -8,7 +9,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class SegmentedItemTheme : ControlTheme
+internal class SegmentedItemTheme : BaseControlTheme
 {
    public const string MainLayoutPart = "PART_MainLayout";
    

src/AtomUI.Controls/Segmented/SegmentedTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Layout;
@@ -8,7 +9,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-public class SegmentedTheme : ControlTheme
+public class SegmentedTheme : BaseControlTheme
 {
    public const string MainContainerPart = "PART_MainContainer";
    public SegmentedTheme()

src/AtomUI.Controls/Segmented/SegmentedToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 using Avalonia.Media;
 

src/AtomUI.Controls/Separator/Separator.cs

@@ -1,6 +1,6 @@
-using AtomUI.Data;
+using AtomUI.Media;
-using AtomUI.Media;
+using AtomUI.Theme.Data;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Controls;

src/AtomUI.Controls/Separator/SeparatorTheme.cs

@@ -1,4 +1,6 @@
-using AtomUI.Styling;
+
+using AtomUI.Theme.Styling;
+using AtomUI.Theme;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
@@ -8,7 +10,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class SeparatorTheme : ControlTheme
+internal class SeparatorTheme : BaseControlTheme
 {
    public const string TitlePart = "PART_Title";
 

src/AtomUI.Controls/Separator/SeparatorToken.cs

@@ -1,4 +1,4 @@
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 
 namespace AtomUI.Controls;

src/AtomUI.Controls/Slider/SliderTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
@@ -9,7 +10,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class SliderTheme : ControlTheme
+internal class SliderTheme : BaseControlTheme
 {
    public const string TrackPart = "PART_Track";
    public const string StartThumbPart = "PART_StartThumb";

src/AtomUI.Controls/Slider/SliderThumb.cs

@@ -1,6 +1,6 @@
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.Utils;
+using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Automation.Peers;

src/AtomUI.Controls/Slider/SliderThumbTheme.cs

@@ -1,11 +1,12 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia;
 using Avalonia.Styling;
 
 namespace AtomUI.Controls;
 
 [ControlThemeProvider]
-internal class SliderThumbTheme : ControlTheme
+internal class SliderThumbTheme : BaseControlTheme
 {
    public SliderThumbTheme() : base(typeof(SliderThumb))
    {

src/AtomUI.Controls/Slider/SliderToken.cs

@@ -1,5 +1,5 @@
 using AtomUI.Media;
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 using Avalonia.Media;
 

src/AtomUI.Controls/Slider/SliderTrack.cs

@@ -1,6 +1,7 @@
 using System.Globalization;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
+using AtomUI.Theme.Utils;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Animation;

src/AtomUI.Controls/Switch/SwitchKnob.cs

@@ -1,6 +1,7 @@
 using AtomUI.Data;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
+using AtomUI.Theme.Utils;
 using AtomUI.Utils;
 using Avalonia;
 using Avalonia.Animation;

src/AtomUI.Controls/Switch/ToggleSwitch.cs

@@ -2,8 +2,8 @@ using AtomUI.Controls.Switch;
 using AtomUI.Controls.Utils;
 using AtomUI.Icon;
 using AtomUI.Media;
-using AtomUI.Styling;
+using AtomUI.Theme.Styling;
-using AtomUI.Utils;
+using AtomUI.Theme.Utils;
 using Avalonia;
 using Avalonia.Animation;
 using Avalonia.Controls;

src/AtomUI.Controls/Switch/ToggleSwitchTheme.cs

@@ -1,4 +1,5 @@
-using AtomUI.Styling;
+using AtomUI.Theme;
+using AtomUI.Theme.Styling;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Styling;
@@ -6,7 +7,7 @@ using Avalonia.Styling;
 namespace AtomUI.Controls.Switch;
 
 [ControlThemeProvider]
-public class ToggleSwitchTheme : ControlTheme
+public class ToggleSwitchTheme : BaseControlTheme
 {
    public const string SwitchKnobPart = "PART_SwitchKnob";
    public const string MainContainerPart = "PART_MainContainer";

src/AtomUI.Controls/Switch/ToggleSwitchToken.cs

@@ -1,5 +1,5 @@
 using AtomUI.Media;
-using AtomUI.TokenSystem;
+using AtomUI.Theme.TokenSystem;
 using Avalonia;
 using Avalonia.Media;
 

src/AtomUI.Controls/TabControl/BaseTabStripTheme.cs

@@ -1,9 +1,10 @@
-using Avalonia.Controls;
+using AtomUI.Theme;
+using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 
 namespace AtomUI.Controls;
 
-internal class BaseTabStripTheme : ControlTheme
+internal class BaseTabStripTheme : BaseControlTheme
 {
    public const string MainContainerPart = "Part_MainContainer";
    public const string ItemsPresenterPart = "PART_ItemsPresenter";