feat: 1. Update dependency.

2. Provide sample for Dialog StyleClass option.
2024-11-03 22:26:14 +08:00
parent ee707cd977
commit 9d394753d7
10 changed files with 175 additions and 166 deletions
--- a/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
+++ b/src/Ursa.Themes.Semi/Behaviors/ClassHelper.cs
@@ -1,69 +0,0 @@
-using System.Collections.Specialized;
-using Avalonia;
-using Avalonia.Collections;
-
-namespace Ursa.Themes.Semi;
-
-internal class ClassHelper : AvaloniaObject
-{
-    public static readonly AttachedProperty<string> ClassesProperty =
-        AvaloniaProperty.RegisterAttached<ClassHelper, StyledElement, string>("Classes");
-
-    public static readonly AttachedProperty<StyledElement> ClassSourceProperty =
-        AvaloniaProperty.RegisterAttached<ClassHelper, StyledElement, StyledElement>("ClassSource");
-
-    static ClassHelper()
-    {
-        ClassesProperty.Changed.AddClassHandler<StyledElement>(OnClassesChanged);
-        ClassSourceProperty.Changed.AddClassHandler<StyledElement>(OnClassSourceChanged);
-    }
-
-    private static void OnClassSourceChanged(StyledElement arg1, AvaloniaPropertyChangedEventArgs arg2)
-    {
-        if (arg2.NewValue is StyledElement styledElement)
-        {
-            arg1.Classes.Clear();
-            var nonPseudoClasses = styledElement.Classes.Where(c => !c.StartsWith(":"));
-            arg1.Classes.AddRange(nonPseudoClasses);
-            styledElement.Classes.WeakSubscribe((o, e) => OnSourceClassesChanged(o, e, arg1));
-        }
-    }
-
-    private static void OnSourceClassesChanged(object sender, NotifyCollectionChangedEventArgs e, StyledElement target)
-    {
-        if (sender is AvaloniaList<string> classes)
-        {
-            target.Classes.Clear();
-            var nonPseudoClasses = classes.Where(c => !c.StartsWith(":"));
-            target.Classes.AddRange(nonPseudoClasses);
-        }
-    }
-
-    public static void SetClasses(AvaloniaObject obj, string value)
-    {
-        obj.SetValue(ClassesProperty, value);
-    }
-
-    public static string GetClasses(AvaloniaObject obj)
-    {
-        return obj.GetValue(ClassesProperty);
-    }
-
-    private static void OnClassesChanged(StyledElement sender, AvaloniaPropertyChangedEventArgs value)
-    {
-        var classes = value.GetNewValue<string?>();
-        if (classes is null) return;
-        sender.Classes.Clear();
-        sender.Classes.Add(classes);
-    }
-
-    public static void SetClassSource(StyledElement obj, StyledElement value)
-    {
-        obj.SetValue(ClassSourceProperty, value);
-    }
-
-    public static StyledElement GetClassSource(StyledElement obj)
-    {
-        return obj.GetValue(ClassSourceProperty);
-    }
-}
--- a/src/Ursa.Themes.Semi/Controls/AutoCompleteBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/AutoCompleteBox.axaml
@@ -2,7 +2,7 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:u="https://irihi.tech/ursa"
-    xmlns:usemi="https://irihi.tech/ursa/themes/semi">
+    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
    <!--  Add Resources Here  -->
    <ControlTheme x:Key="{x:Type u:AutoCompleteBox}" TargetType="u:AutoCompleteBox">
        <Setter Property="VerticalAlignment" Value="Center" />
@@ -15,7 +15,7 @@
                        Name="PART_TextBox"
                        MinHeight="{TemplateBinding MinHeight}"
                        VerticalAlignment="Stretch"
-                        usemi:ClassHelper.ClassSource="{TemplateBinding}"
+                        helpers:ClassHelper.ClassSource="{TemplateBinding}"
                        DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                        InnerLeftContent="{TemplateBinding InnerLeftContent}"
                        InnerRightContent="{TemplateBinding InnerRightContent}"
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:theme="clr-namespace:Ursa.Themes.Semi"
-    xmlns:u="https://irihi.tech/ursa">
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">

    <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
        <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}" />
@@ -207,35 +207,24 @@
                                        DockPanel.Dock="Right"
                                        Theme="{DynamicResource OverlayCloseButton}" />
                                </Grid>
-                                <StackPanel
+                                <Grid
                                    Grid.Row="2"
                                    Margin="24,0,24,24"
                                    HorizontalAlignment="Right"
-                                    Orientation="Horizontal">
+                                    ColumnDefinitions="Auto, Auto, Auto, Auto">
                                    <Button
                                        Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
-                                        Margin="8,0,0,0"
-                                        Classes="Tertiary"
-                                        Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                                        Margin="8,0,0,0" />
                                    <Button
                                        Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
-                                        Margin="8,0,0,0"
-                                        Classes="Danger"
-                                        Content="{DynamicResource STRING_MENU_DIALOG_NO}"
-                                        Theme="{DynamicResource SolidButton}" />
+                                        Margin="8,0,0,0"/>
                                    <Button
                                        Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
-                                        Margin="8,0,0,0"
-                                        Classes="Primary"
-                                        Content="{DynamicResource STRING_MENU_DIALOG_YES}"
-                                        Theme="{DynamicResource SolidButton}" />
+                                        Margin="8,0,0,0"/>
                                    <Button
                                        Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
-                                        Margin="8,0,0,0"
-                                        Classes="Primary"
-                                        Content="{DynamicResource STRING_MENU_DIALOG_OK}"
-                                        Theme="{DynamicResource SolidButton}" />
-                                </StackPanel>
+                                        Margin="8,0,0,0"/>
+                                </Grid>
                                
                            </Grid>
                        </Border>
@@ -254,6 +243,29 @@
            <Setter Property="Margin" Value="0" />
            <Setter Property="Background" Value="{DynamicResource BorderCardBackground}" />
        </Style>
+        <Style Selector="^ /template/ Button#PART_CancelButton">
+            <Setter Property="Grid.Column" Value="0"/>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_NoButton">
+            <Setter Property="Grid.Column" Value="1"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Danger"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_YesButton">
+            <Setter Property="Grid.Column" Value="2"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Primary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_OKButton">
+            <Setter Property="Grid.Column" Value="3"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Primary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
        <Style Selector="^[Mode=None]">
            <Style Selector="^ /template/ PathIcon#PART_Icon">
                <Setter Property="IsVisible" Value="False" />
@@ -262,16 +274,16 @@
                <Setter Property="Margin" Value="24 24 0 0" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Info]">
@@ -281,16 +293,16 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Warning]">
@@ -300,19 +312,19 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Error]">
@@ -322,16 +334,16 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Question]">
@@ -341,16 +353,16 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Success]">
@@ -360,16 +372,16 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^ /template/ Panel#PART_TitleArea">
@@ -604,27 +616,16 @@
                                Orientation="Horizontal">
                                <Button
                                    Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
-                                    Margin="8,0,0,0"
-                                    Classes="Tertiary"
-                                    Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                                    Margin="8,0,0,0" />
                                <Button
                                    Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
-                                    Margin="8,0,0,0"
-                                    Classes="Danger"
-                                    Content="{DynamicResource STRING_MENU_DIALOG_NO}"
-                                    Theme="{DynamicResource SolidButton}" />
+                                    Margin="8,0,0,0" />
                                <Button
                                    Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
-                                    Margin="8,0,0,0"
-                                    Classes="Primary"
-                                    Content="{DynamicResource STRING_MENU_DIALOG_YES}"
-                                    Theme="{DynamicResource SolidButton}" />
+                                    Margin="8,0,0,0" />
                                <Button
                                    Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
-                                    Margin="8,0,0,0"
-                                    Classes="Primary"
-                                    Content="{DynamicResource STRING_MENU_DIALOG_OK}"
-                                    Theme="{DynamicResource SolidButton}" />
+                                    Margin="8,0,0,0" />
                            </StackPanel>
                            
                        </Grid>
@@ -633,6 +634,29 @@
                </Panel>
            </ControlTemplate>
        </Setter>
+        <Style Selector="^ /template/ Button#PART_CancelButton">
+            <Setter Property="Grid.Column" Value="0"/>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_NoButton">
+            <Setter Property="Grid.Column" Value="1"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Danger"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_YesButton">
+            <Setter Property="Grid.Column" Value="2"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Primary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_OKButton">
+            <Setter Property="Grid.Column" Value="3"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Primary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
        <Style Selector="^[Mode=None]">
            <Style Selector="^ /template/ PathIcon#PART_Icon">
                <Setter Property="IsVisible" Value="False" />
@@ -641,16 +665,16 @@
                <Setter Property="Margin" Value="24 24 0 0" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Info]">
@@ -660,16 +684,16 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Warning]">
@@ -679,19 +703,19 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
                <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Error]">
@@ -701,16 +725,16 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Question]">
@@ -720,16 +744,16 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
        <Style Selector="^[Mode=Success]">
@@ -739,16 +763,16 @@
                <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
            </Style>
            <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
            </Style>
            <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Success" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
            </Style>
            <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
            </Style>
            <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="theme:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
            </Style>
        </Style>
    </ControlTheme>
--- a/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
@@ -2,7 +2,7 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:u="https://irihi.tech/ursa"
-    xmlns:u-semi="https://irihi.tech/ursa/themes/semi">
+    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
    <!--  Add Resources Here  -->
    <ControlTheme x:Key="{x:Type u:EnumSelector}" TargetType="u:EnumSelector">
        <Setter Property="HorizontalAlignment" Value="Left" />
@@ -10,7 +10,7 @@
            <ControlTemplate TargetType="u:EnumSelector">
                <ComboBox
                    Width="{TemplateBinding Width}"
-                    u-semi:ClassHelper.ClassSource="{TemplateBinding}"
+                    helpers:ClassHelper.ClassSource="{TemplateBinding}"
                    HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                    VerticalAlignment="{TemplateBinding VerticalAlignment}"
                    Name="PART_ComboBox"
--- a/src/Ursa.Themes.Semi/Styles/PinCode.axaml
+++ b/src/Ursa.Themes.Semi/Styles/PinCode.axaml
@@ -1,7 +1,8 @@
 <Styles xmlns="https://github.com/avaloniaui"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:u="https://irihi.tech/ursa"
-        xmlns:theme="https://irihi.tech/ursa/themes/semi">
+        xmlns:theme="https://irihi.tech/ursa/themes/semi"
+        xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
    <Design.PreviewWith>
        <Border Padding="20">
            <!-- Add Controls for Previewer Here -->
@@ -16,7 +17,7 @@
    </Style>
    <Style Selector="u|PinCode.Small">
        <Style Selector="^ u|PinCodeItem">
-            <Setter Property="theme:ClassHelper.Classes" Value="Small"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Small"></Setter>
            <Style Selector="^:nth-last-child(n+2)">
                <Setter Property="Margin" Value="0 0 6 0"></Setter>
            </Style>
@@ -24,7 +25,7 @@
    </Style>
    <Style Selector="u|PinCode.Large">
        <Style Selector="^ u|PinCodeItem">
-            <Setter Property="theme:ClassHelper.Classes" Value="Large"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Large"></Setter>
            <Style Selector="^:nth-last-child(n+2)">
                <Setter Property="Margin" Value="0 0 12 0"></Setter>
            </Style>
--- a/src/Ursa/Ursa.csproj
+++ b/src/Ursa/Ursa.csproj
@@ -15,7 +15,8 @@

    <ItemGroup>
        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.1.9" />
+        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.2.0" />
+        <PackageReference Include="Irihi.Avalonia.Shared.Contracts" Version="0.2.0" />
    </ItemGroup>

    <ItemGroup>