From 522dc935b55c9783b98218b39762edebf87ea468 Mon Sep 17 00:00:00 2001
From: swety2003 <swety2003@outlook.com>
Date: Mon, 12 Aug 2024 14:24:33 +0800
Subject: [PATCH 1/8] Move SettingsCard to a separate folder

---
 .../{ => SettingsCard}/SettingsCard.Properties.cs                 | 0
 .../Controls/SettingsControls/{ => SettingsCard}/SettingsCard.cs  | 0
 .../SettingsControls/{ => SettingsCard}/SettingsCard.xaml         | 0
 .../{ => SettingsCard}/SettingsCardAutomationPeer.cs              | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/{ => SettingsCard}/SettingsCard.Properties.cs (100%)
 rename source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/{ => SettingsCard}/SettingsCard.cs (100%)
 rename source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/{ => SettingsCard}/SettingsCard.xaml (100%)
 rename source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/{ => SettingsCard}/SettingsCardAutomationPeer.cs (100%)

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard.Properties.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.Properties.cs
similarity index 100%
rename from source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard.Properties.cs
rename to source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.Properties.cs
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
similarity index 100%
rename from source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard.cs
rename to source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml
similarity index 100%
rename from source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard.xaml
rename to source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCardAutomationPeer.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCardAutomationPeer.cs
similarity index 100%
rename from source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCardAutomationPeer.cs
rename to source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCardAutomationPeer.cs

From b2ffe2d5bdbc74c41795d79d50e27fabb46138f4 Mon Sep 17 00:00:00 2001
From: swety2003 <swety2003@outlook.com>
Date: Mon, 12 Aug 2024 14:25:21 +0800
Subject: [PATCH 2/8] Add SettingsExpander

---
 .../SettingsExpander.Events.cs                |  21 +
 .../SettingsExpander.ItemsControl.cs          |  77 ++++
 .../SettingsExpander.Properties.cs            | 182 +++++++++
 .../SettingsExpander/SettingsExpander.cs      |  89 ++++
 .../SettingsExpander/SettingsExpander.xaml    | 385 ++++++++++++++++++
 .../SettingsExpanderAutomationPeer.cs         |  86 ++++
 .../SettingsExpanderItemStyleSelector.cs      |  49 +++
 .../Themes/Generic.xaml                       |   3 +-
 8 files changed, 891 insertions(+), 1 deletion(-)
 create mode 100644 source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Events.cs
 create mode 100644 source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.ItemsControl.cs
 create mode 100644 source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Properties.cs
 create mode 100644 source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.cs
 create mode 100644 source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
 create mode 100644 source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpanderAutomationPeer.cs
 create mode 100644 source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpanderItemStyleSelector.cs

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Events.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Events.cs
new file mode 100644
index 0000000..1fd22e5
--- /dev/null
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Events.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace iNKORE.UI.WPF.Modern.Controls
+{
+    public partial class SettingsExpander
+    {
+        /// <summary>
+        /// Fires when the SettingsExpander is opened
+        /// </summary>
+        public event EventHandler? Expanded;
+
+        /// <summary>
+        /// Fires when the expander is closed
+        /// </summary>
+        public event EventHandler? Collapsed;
+    }
+}
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.ItemsControl.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.ItemsControl.cs
new file mode 100644
index 0000000..6c402de
--- /dev/null
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.ItemsControl.cs
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace iNKORE.UI.WPF.Modern.Controls
+{
+
+    //// Implement properties for ItemsControl like behavior.
+    public partial class SettingsExpander
+    {
+        public IList<object> Items
+        {
+            get { return (IList<object>)GetValue(ItemsProperty); }
+            set { SetValue(ItemsProperty, value); }
+        }
+
+        public static readonly DependencyProperty ItemsProperty =
+            DependencyProperty.Register(nameof(Items), typeof(IList<object>), typeof(SettingsExpander), new PropertyMetadata(null, OnItemsConnectedPropertyChanged));
+
+        public object ItemsSource
+        {
+            get { return (object)GetValue(ItemsSourceProperty); }
+            set { SetValue(ItemsSourceProperty, value); }
+        }
+
+        public static readonly DependencyProperty ItemsSourceProperty =
+            DependencyProperty.Register(nameof(ItemsSource), typeof(object), typeof(SettingsExpander), new PropertyMetadata(null, OnItemsConnectedPropertyChanged));
+
+        public object ItemTemplate
+        {
+            get { return (object)GetValue(ItemTemplateProperty); }
+            set { SetValue(ItemTemplateProperty, value); }
+        }
+
+        public static readonly DependencyProperty ItemTemplateProperty =
+            DependencyProperty.Register(nameof(ItemTemplate), typeof(object), typeof(SettingsExpander), new PropertyMetadata(null));
+
+        public StyleSelector ItemContainerStyleSelector
+        {
+            get { return (StyleSelector)GetValue(ItemContainerStyleSelectorProperty); }
+            set { SetValue(ItemContainerStyleSelectorProperty, value); }
+        }
+
+        public static readonly DependencyProperty ItemContainerStyleSelectorProperty =
+            DependencyProperty.Register(nameof(ItemContainerStyleSelector), typeof(StyleSelector), typeof(SettingsExpander), new PropertyMetadata(null));
+
+        private static void OnItemsConnectedPropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs args)
+        {
+            if (dependencyObject is SettingsExpander expander && expander._itemsRepeater is not null)
+            {
+                var datasource = expander.ItemsSource;
+
+                if (datasource is null)
+                {
+                    datasource = expander.Items;
+                }
+
+                expander._itemsRepeater.ItemsSource = datasource;
+            }
+        }
+
+        private void ItemsRepeater_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args)
+        {
+            if (ItemContainerStyleSelector != null &&
+                args.Element is FrameworkElement element &&
+                element.ReadLocalValue(FrameworkElement.StyleProperty) == DependencyProperty.UnsetValue)
+            {
+                // TODO: Get item from args.Index?
+                element.Style = ItemContainerStyleSelector.SelectStyle(null, element);
+            }
+        }
+    }
+}
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Properties.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Properties.cs
new file mode 100644
index 0000000..af64e82
--- /dev/null
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Properties.cs
@@ -0,0 +1,182 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Markup;
+using System.Windows;
+
+namespace iNKORE.UI.WPF.Modern.Controls
+{
+    // Licensed to the .NET Foundation under one or more agreements.
+    // The .NET Foundation licenses this file to you under the MIT license.
+    // See the LICENSE file in the project root for more information.
+
+    [ContentProperty(name:nameof(Content))]
+    public partial class SettingsExpander
+    {
+        /// <summary>
+        /// The backing <see cref="DependencyProperty"/> for the <see cref="CornerRadius"/> property.
+        /// </summary>
+        public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
+            nameof(CornerRadius), typeof(CornerRadius), typeof(SettingsExpander), new PropertyMetadata(default(CornerRadius)));
+
+
+        /// <summary>
+        /// The backing <see cref="DependencyProperty"/> for the <see cref="Header"/> property.
+        /// </summary>
+        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+            nameof(Header),
+            typeof(object),
+            typeof(SettingsExpander),
+            new PropertyMetadata(defaultValue: null));
+
+        /// <summary>
+        /// The backing <see cref="DependencyProperty"/> for the <see cref="Description"/> property.
+        /// </summary>
+        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+            nameof(Description),
+            typeof(object),
+            typeof(SettingsExpander),
+            new PropertyMetadata(defaultValue: null));
+
+        /// <summary>
+        /// The backing <see cref="DependencyProperty"/> for the <see cref="HeaderIcon"/> property.
+        /// </summary>
+        public static readonly DependencyProperty HeaderIconProperty = DependencyProperty.Register(
+            nameof(HeaderIcon),
+            typeof(IconElement),
+            typeof(SettingsExpander),
+            new PropertyMetadata(defaultValue: null));
+
+
+        /// <summary>
+        /// The backing <see cref="DependencyProperty"/> for the <see cref="Content"/> property.
+        /// </summary>
+        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
+            nameof(Content),
+            typeof(object),
+            typeof(SettingsExpander),
+            new PropertyMetadata(defaultValue: null));
+
+        /// <summary>
+        /// The backing <see cref="DependencyProperty"/> for the <see cref="Content"/> property.
+        /// </summary>
+        public static readonly DependencyProperty ItemsHeaderProperty = DependencyProperty.Register(
+            nameof(ItemsHeader),
+            typeof(UIElement),
+            typeof(SettingsExpander),
+            new PropertyMetadata(defaultValue: null));
+
+        /// <summary>
+        /// The backing <see cref="DependencyProperty"/> for the <see cref="Content"/> property.
+        /// </summary>
+        public static readonly DependencyProperty ItemsFooterProperty = DependencyProperty.Register(
+            nameof(ItemsFooter),
+            typeof(UIElement),
+            typeof(SettingsExpander),
+            new PropertyMetadata(defaultValue: null));
+
+        /// <summary>
+        /// The backing <see cref="DependencyProperty"/> for the <see cref="IsExpanded"/> property.
+        /// </summary>
+        public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register(
+         nameof(IsExpanded),
+         typeof(bool),
+         typeof(SettingsExpander),
+         new PropertyMetadata(defaultValue: false, (d, e) => ((SettingsExpander)d).OnIsExpandedPropertyChanged((bool)e.OldValue, (bool)e.NewValue)));
+
+
+        /// <summary>
+        /// 
+        /// <summary>
+        /// Gets or sets the CornerRadius.
+        /// </summary>
+        public CornerRadius CornerRadius
+        {
+            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
+            set { SetValue(CornerRadiusProperty, value); }
+        }
+
+        /// <summary>
+        /// 
+        /// <summary>
+        /// Gets or sets the Header.
+        /// </summary>
+        public object Header
+        {
+            get => (object)GetValue(HeaderProperty);
+            set => SetValue(HeaderProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the Description.
+        /// </summary>
+#pragma warning disable CS0109 // Member does not hide an inherited member; new keyword is not required
+        public new object Description
+#pragma warning restore CS0109 // Member does not hide an inherited member; new keyword is not required
+        {
+            get => (object)GetValue(DescriptionProperty);
+            set => SetValue(DescriptionProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the HeaderIcon.
+        /// </summary>
+        public IconElement HeaderIcon
+        {
+            get => (IconElement)GetValue(HeaderIconProperty);
+            set => SetValue(HeaderIconProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the Content.
+        /// </summary>
+        public object Content
+        {
+            get => (object)GetValue(ContentProperty);
+            set => SetValue(ContentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the ItemsFooter.
+        /// </summary>
+        public UIElement ItemsHeader
+        {
+            get => (UIElement)GetValue(ItemsHeaderProperty);
+            set => SetValue(ItemsHeaderProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the ItemsFooter.
+        /// </summary>
+        public UIElement ItemsFooter
+        {
+            get => (UIElement)GetValue(ItemsFooterProperty);
+            set => SetValue(ItemsFooterProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the IsExpanded state.
+        /// </summary>
+        public bool IsExpanded
+        {
+            get => (bool)GetValue(IsExpandedProperty);
+            set => SetValue(IsExpandedProperty, value);
+        }
+        protected virtual void OnIsExpandedPropertyChanged(bool oldValue, bool newValue)
+        {
+            OnIsExpandedChanged(oldValue, newValue);
+
+            if (newValue)
+            {
+                Expanded?.Invoke(this, EventArgs.Empty);
+            }
+            else
+            {
+                Collapsed?.Invoke(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.cs
new file mode 100644
index 0000000..83ece7d
--- /dev/null
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.cs
@@ -0,0 +1,89 @@
+using System.Collections.Generic;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation;
+using System.Windows;
+
+namespace iNKORE.UI.WPF.Modern.Controls
+{
+    // Licensed to the .NET Foundation under one or more agreements.
+    // The .NET Foundation licenses this file to you under the MIT license.
+    // See the LICENSE file in the project root for more information.
+
+    //// Note: ItemsRepeater will request all the available horizontal space: https://github.com/microsoft/microsoft-ui-xaml/issues/3842
+    [TemplatePart(Name = PART_ItemsRepeater, Type = typeof(ItemsRepeater))]
+    [StyleTypedProperty(Property = "ItemContainerStyle", StyleTargetType = typeof(FrameworkElement))]
+    public partial class SettingsExpander : System.Windows.Controls.Control
+    {
+        private const string PART_ItemsRepeater = "PART_ItemsRepeater";
+
+        private ItemsRepeater? _itemsRepeater;
+
+        /// <summary>
+        /// The SettingsExpander is a collapsable control to host multiple SettingsCards.
+        /// </summary>
+        public SettingsExpander()
+        {
+            this.DefaultStyleKey = typeof(SettingsExpander);
+            Items = new List<object>();
+        }
+
+        /// <inheritdoc />
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            SetAccessibleName();
+
+            if (_itemsRepeater != null)
+            {
+                _itemsRepeater.ElementPrepared -= this.ItemsRepeater_ElementPrepared;
+            }
+
+            _itemsRepeater = GetTemplateChild(PART_ItemsRepeater) as ItemsRepeater;
+
+            if (_itemsRepeater != null)
+            {
+                _itemsRepeater.ElementPrepared += this.ItemsRepeater_ElementPrepared;
+
+                // Update it's source based on our current items properties.
+                OnItemsConnectedPropertyChanged(this, new DependencyPropertyChangedEventArgs()); // Can't get it to accept type here? (DependencyPropertyChangedEventArgs)EventArgs.Empty
+            }
+        }
+
+        private void SetAccessibleName()
+        {
+            if (string.IsNullOrEmpty(AutomationProperties.GetName(this)))
+            {
+                if (Header is string headerString && !string.IsNullOrEmpty(headerString))
+                {
+                    AutomationProperties.SetName(this, headerString);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates AutomationPeer
+        /// </summary>
+        /// <returns>An automation peer for <see cref="SettingsExpander"/>.</returns>
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new SettingsExpanderAutomationPeer(this);
+        }
+
+        private void OnIsExpandedChanged(bool oldValue, bool newValue)
+        {
+            var peer = FrameworkElementAutomationPeer.FromElement(this) as SettingsExpanderAutomationPeer;
+            peer?.RaiseExpandedChangedEvent(newValue);
+        }
+
+        //protected override bool IsItemItsOwnContainerOverride(object item)
+        //{
+        //    return item is SettingsCard;
+        //}
+
+        //protected override DependencyObject GetContainerForItemOverride()
+        //{
+        //    var item = new SettingsCard();
+        //    return item;
+        //}
+    }
+}
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
new file mode 100644
index 0000000..206a5ed
--- /dev/null
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
@@ -0,0 +1,385 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers;assembly=iNKORE.UI.WPF.Modern"
+    xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/SettingsControls/SettingsCard/SettingsCard.xaml" />
+        <ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Expander.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <sys:String x:Key="SettingsExpanderChevronToolTip">Show all settings</sys:String>
+    <Thickness x:Key="SettingsExpanderHeaderPadding">16,16,4,16</Thickness>
+    <Thickness x:Key="SettingsExpanderItemPadding">58,8,44,8</Thickness>
+    <Thickness x:Key="SettingsExpanderItemBorderThickness">0,1,0,0</Thickness>
+    <Thickness x:Key="ClickableSettingsExpanderItemPadding">58,8,16,8</Thickness>
+    <sys:Double x:Key="SettingsExpanderContentMinHeight">16</sys:Double>
+    <sys:Double x:Key="SettingsExpanderChevronButtonWidth">32</sys:Double>
+    <sys:Double x:Key="SettingsExpanderChevronButtonHeight">32</sys:Double>
+
+    <CornerRadiusConverter x:Key="CornerRadiusConverter" />
+
+    <Style
+        x:Key="DefaultSettingsExpanderItemStyle"
+        BasedOn="{StaticResource DefaultSettingsCardStyle}"
+        TargetType="local:SettingsCard">
+        <Style.Setters>
+            <Setter Property="BorderThickness" Value="{DynamicResource SettingsExpanderItemBorderThickness}" />
+            <Setter Property="MinHeight" Value="52" />
+            <Setter Property="Padding" Value="{DynamicResource SettingsExpanderItemPadding}" />
+            <Setter Property="chelper:ControlHelper.CornerRadius" Value="0" />
+        </Style.Setters>
+    </Style>
+
+    <Style
+        x:Key="ClickableSettingsExpanderItemStyle"
+        BasedOn="{StaticResource DefaultSettingsExpanderItemStyle}"
+        TargetType="local:SettingsCard">
+        <Style.Setters>
+            <Setter Property="Padding" Value="{DynamicResource ClickableSettingsExpanderItemPadding}" />
+        </Style.Setters>
+    </Style>
+
+    <local:SettingsExpanderItemStyleSelector
+        x:Key="SettingsExpanderItemStyleSelector"
+        ClickableStyle="{StaticResource ClickableSettingsExpanderItemStyle}"
+        DefaultStyle="{StaticResource DefaultSettingsExpanderItemStyle}" />
+
+    <Style x:Key="SettingsExpanderHeaderDownStyle" TargetType="ToggleButton">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <!--<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />-->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border
+                        x:Name="ToggleButtonGrid"
+                        Width="{TemplateBinding Width}"
+                        MinWidth="{TemplateBinding MinWidth}"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        MaxWidth="{TemplateBinding MaxWidth}"
+                        Padding="{TemplateBinding Padding}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{DynamicResource ExpanderHeaderBorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
+                        <Grid SnapsToDevicePixels="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <ui:ContentPresenterEx
+                                x:Name="ContentPresenter"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Foreground="{TemplateBinding Foreground}"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="True" />
+                            <Border
+                                x:Name="ExpandCollapseChevronBorder"
+                                Grid.Column="1"
+                                Width="{DynamicResource ExpanderChevronButtonSize}"
+                                Height="{DynamicResource ExpanderChevronButtonSize}"
+                                Margin="{DynamicResource ExpanderChevronHorizontalMargin}"
+                                Background="{DynamicResource ExpanderChevronBackground}"
+                                BorderBrush="{DynamicResource ExpanderChevronBorderBrush}"
+                                BorderThickness="{DynamicResource ExpanderChevronBorderThickness}"
+                                CornerRadius="{DynamicResource ControlCornerRadius}">
+                                <ui:FontIcon
+                                    x:Name="ExpandCollapseChevron"
+                                    Width="{DynamicResource ExpanderChevronGlyphSize}"
+                                    Height="{DynamicResource ExpanderChevronGlyphSize}"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontFamily="{DynamicResource FluentSystemIcons}"
+                                    FontSize="12"
+                                    Foreground="{DynamicResource ExpanderChevronForeground}"
+                                    Glyph="{DynamicResource ExpanderChevronDownGlyph}"
+                                    RenderTransformOrigin="0.5, 0.5"
+                                    SnapsToDevicePixels="false">
+                                    <ui:FontIcon.RenderTransform>
+                                        <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="0" />
+                                    </ui:FontIcon.RenderTransform>
+                                </ui:FontIcon>
+                            </Border>
+                        </Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
+                                            Storyboard.TargetProperty="Angle"
+                                            To="180.0"
+                                            Duration="0:0:0.2" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ExpandCollapseChevronRotateTransform"
+                                            Storyboard.TargetProperty="Angle"
+                                            To="0.0"
+                                            Duration="0:0:0.2" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForeground}" />
+                            <Setter TargetName="ToggleButtonGrid" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrush}" />
+                            <Setter TargetName="ExpandCollapseChevron" Property="Foreground" Value="{DynamicResource ExpanderChevronForeground}" />
+                            <Setter TargetName="ExpandCollapseChevronBorder" Property="BorderBrush" Value="{DynamicResource ExpanderChevronBorderBrush}" />
+                            <Setter TargetName="ExpandCollapseChevronBorder" Property="Background" Value="{DynamicResource ExpanderChevronBackground}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForegroundPointerOver}" />
+                            <Setter TargetName="ToggleButtonGrid" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPointerOverBrush}" />
+                            <Setter TargetName="ExpandCollapseChevron" Property="Foreground" Value="{DynamicResource ExpanderChevronPointerOverForeground}" />
+                            <Setter TargetName="ExpandCollapseChevronBorder" Property="BorderBrush" Value="{DynamicResource ExpanderChevronBorderPointerOverBrush}" />
+                            <Setter TargetName="ExpandCollapseChevronBorder" Property="Background" Value="{DynamicResource ExpanderChevronPointerOverBackground}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="true">
+                            <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderForegroundPressed}" />
+                            <Setter TargetName="ToggleButtonGrid" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderPressedBrush}" />
+                            <Setter TargetName="ExpandCollapseChevron" Property="Foreground" Value="{DynamicResource ExpanderChevronPressedForeground}" />
+                            <Setter TargetName="ExpandCollapseChevronBorder" Property="BorderBrush" Value="{DynamicResource ExpanderChevronBorderPressedBrush}" />
+                            <Setter TargetName="ExpandCollapseChevronBorder" Property="Background" Value="{DynamicResource ExpanderChevronPressedBackground}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
+                            <Setter TargetName="ToggleButtonGrid" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
+                            <Setter TargetName="ExpandCollapseChevron" Property="Foreground" Value="{DynamicResource ExpanderHeaderDisabledForeground}" />
+                            <Setter TargetName="ExpandCollapseChevronBorder" Property="BorderBrush" Value="{DynamicResource ExpanderHeaderDisabledBorderBrush}" />
+                            <Setter TargetName="ExpandCollapseChevronBorder" Property="Background" Value="{DynamicResource ExpanderChevronBackground}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <Style x:Key="SettingsExpanderExpanderStyle" TargetType="Expander">
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Background" Value="{DynamicResource ExpanderContentBackground}" />
+        <Setter Property="MinWidth" Value="{DynamicResource FlyoutThemeMinWidth}" />
+        <Setter Property="MinHeight" Value="{DynamicResource ExpanderMinHeight}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ExpanderContentDownBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ExpanderContentBorderBrush}" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="chelper:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Expander">
+                    <Grid MinWidth="{TemplateBinding MinWidth}" MaxWidth="{TemplateBinding MaxWidth}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition x:Name="Row0" Height="Auto" />
+                            <RowDefinition x:Name="Row1" Height="*" />
+                        </Grid.RowDefinitions>
+                        <ToggleButton
+                            x:Name="ExpanderHeader"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            HorizontalAlignment="Stretch"
+                            HorizontalContentAlignment="{DynamicResource ExpanderHeaderHorizontalContentAlignment}"
+                            VerticalContentAlignment="{DynamicResource ExpanderHeaderVerticalContentAlignment}"
+                            Background="{DynamicResource ExpanderHeaderBackground}"
+                            BorderBrush="{DynamicResource ExpanderHeaderBorderBrush}"
+                            BorderThickness="{DynamicResource ExpanderHeaderBorderThickness}"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                            IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            IsEnabled="{TemplateBinding IsEnabled}"
+                            IsTabStop="True"
+                            Style="{StaticResource SettingsExpanderHeaderDownStyle}" />
+                        <!--  The clip is a composition clip applied in code  -->
+                        <Border x:Name="ExpanderContentClip" Grid.Row="1">
+                            <Border
+                                x:Name="ExpanderContent"
+                                MinHeight="{DynamicResource SettingsExpanderContentMinHeight}"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{DynamicResource ExpanderContentDownBorderThickness}"
+                                CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                                Visibility="Collapsed">
+                                <ContentPresenter
+                                    Margin="0,-2,0,0"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+                                <Border.RenderTransform>
+                                    <TranslateTransform />
+                                </Border.RenderTransform>
+                            </Border>
+                        </Border>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="true">
+                            <Setter TargetName="ExpanderContent" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Right">
+                            <Setter TargetName="ExpanderHeader" Property="Style" Value="{DynamicResource ExpanderCardRightHeaderRightStyle}" />
+                            <Setter TargetName="ExpanderHeader" Property="Padding" Value="{DynamicResource ExpanderHeaderVerticalPadding}" />
+                            <Setter TargetName="ExpanderHeader" Property="VerticalContentAlignment" Value="Stretch" />
+                            <Setter TargetName="ExpanderHeader" Property="HorizontalContentAlignment" Value="Center" />
+                            <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentRightBorderThickness}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Right" />
+                            <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Left" />
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Up">
+                            <Setter TargetName="ExpanderHeader" Property="Style" Value="{DynamicResource ExpanderCardHeaderUpStyle}" />
+                            <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentUpBorderThickness}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Top" />
+                            <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Bottom" />
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Left">
+                            <Setter TargetName="ExpanderHeader" Property="Style" Value="{DynamicResource ExpanderCardHeaderLeftStyle}" />
+                            <Setter TargetName="ExpanderHeader" Property="Padding" Value="{DynamicResource ExpanderHeaderVerticalPadding}" />
+                            <Setter TargetName="ExpanderHeader" Property="VerticalContentAlignment" Value="Stretch" />
+                            <Setter TargetName="ExpanderHeader" Property="HorizontalContentAlignment" Value="Center" />
+                            <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentLeftBorderThickness}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Left" />
+                            <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Right" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
+                        </Trigger>
+
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsExpanded" Value="true" />
+                                <Condition Property="ExpandDirection" Value="Down" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter TargetName="ExpanderHeader" Property="chelper:ControlHelper.CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsExpanded" Value="true" />
+                                <Condition Property="ExpandDirection" Value="Right" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter TargetName="ExpanderHeader" Property="chelper:ControlHelper.CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsExpanded" Value="true" />
+                                <Condition Property="ExpandDirection" Value="Up" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter TargetName="ExpanderHeader" Property="chelper:ControlHelper.CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsExpanded" Value="true" />
+                                <Condition Property="ExpandDirection" Value="Left" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter TargetName="ExpanderHeader" Property="chelper:ControlHelper.CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="DefaultSettingsExpanderStyle" TargetType="local:SettingsExpander">
+        <Style.Setters>
+            <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}" />
+            <Setter Property="Foreground" Value="{DynamicResource SettingsCardForeground}" />
+            <Setter Property="BorderBrush" Value="{DynamicResource SettingsCardBorderBrush}" />
+            <Setter Property="BorderThickness" Value="{DynamicResource SettingsCardBorderThickness}" />
+            <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+            <Setter Property="MinHeight" Value="{DynamicResource SettingsCardMinHeight}" />
+            <Setter Property="MinWidth" Value="{DynamicResource SettingsCardMinWidth}" />
+            <Setter Property="IsTabStop" Value="False" />
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <!--<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />-->
+            <Setter Property="Padding" Value="{DynamicResource SettingsExpanderHeaderPadding}" />
+            <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
+            <Setter Property="FontWeight" Value="Normal" />
+            <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+            <!--<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />-->
+            <Setter Property="ItemContainerStyleSelector" Value="{StaticResource SettingsExpanderItemStyleSelector}" />
+            <!--<Setter Property="FocusVisualMargin" Value="-3" />-->
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="local:SettingsExpander">
+                        <Expander
+                            MinWidth="{TemplateBinding MinWidth}"
+                            MinHeight="{TemplateBinding MinHeight}"
+                            HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            IsExpanded="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Style="{StaticResource SettingsExpanderExpanderStyle}">
+                            <Expander.Header>
+                                <local:SettingsCard
+                                    Padding="{StaticResource SettingsExpanderHeaderPadding}"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    BorderThickness="0"
+                                    Content="{TemplateBinding Content}"
+                                    Description="{TemplateBinding Description}"
+                                    FontFamily="{TemplateBinding FontFamily}"
+                                    Header="{TemplateBinding Header}"
+                                    HeaderIcon="{TemplateBinding HeaderIcon}"
+                                    IsClickEnabled="False" />
+                            </Expander.Header>
+                            <Expander.Content>
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="*" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentPresenter Content="{TemplateBinding ItemsHeader}" />
+                                    <local:ItemsRepeater
+                                        x:Name="PART_ItemsRepeater"
+                                        Grid.Row="1"
+                                        ItemTemplate="{Binding ItemTemplate, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}">
+                                        <local:ItemsRepeater.Layout>
+                                            <local:StackLayout Orientation="Vertical" />
+                                        </local:ItemsRepeater.Layout>
+                                    </local:ItemsRepeater>
+                                    <!--<ItemsPresenter Grid.Row="1" />-->
+
+                                    <ContentPresenter Grid.Row="2" Content="{TemplateBinding ItemsFooter}" />
+                                </Grid>
+                            </Expander.Content>
+                        </Expander>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style.Setters>
+    </Style>
+
+    <!--  Implicitly applied default style  -->
+    <Style BasedOn="{StaticResource DefaultSettingsExpanderStyle}" TargetType="local:SettingsExpander" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpanderAutomationPeer.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpanderAutomationPeer.cs
new file mode 100644
index 0000000..b8603a8
--- /dev/null
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpanderAutomationPeer.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Automation.Peers;
+using System.Windows.Automation;
+
+namespace iNKORE.UI.WPF.Modern.Controls
+{
+
+    /// <summary>
+    /// AutomationPeer for SettingsExpander
+    /// </summary>
+    public class SettingsExpanderAutomationPeer : FrameworkElementAutomationPeer
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SettingsExpander"/> class.
+        /// </summary>
+        /// <param name="owner">SettingsExpander</param>
+        public SettingsExpanderAutomationPeer(SettingsExpander owner)
+            : base(owner)
+        {
+        }
+
+        /// <summary>
+        /// Gets the control type for the element that is associated with the UI Automation peer.
+        /// </summary>
+        /// <returns>The control type.</returns>
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return AutomationControlType.Group;
+        }
+
+        /// <summary>
+        /// Called by GetClassName that gets a human readable name that, in addition to AutomationControlType,
+        /// differentiates the control represented by this AutomationPeer.
+        /// </summary>
+        /// <returns>The string that contains the name.</returns>
+        protected override string GetClassNameCore()
+        {
+            return Owner.GetType().Name;
+        }
+
+        protected override string GetNameCore()
+        {
+            string name = base.GetNameCore();
+
+            if (Owner is SettingsExpander owner)
+            {
+                if (!string.IsNullOrEmpty(AutomationProperties.GetName(owner)))
+                {
+                    name = AutomationProperties.GetName(owner);
+                }
+                else
+                {
+                    if (owner.Header is string headerString && !string.IsNullOrEmpty(headerString))
+                    {
+                        name = headerString;
+                    }
+                }
+            }
+            return name;
+        }
+
+        /// <summary>
+        /// Raises the property changed event for this AutomationPeer for the provided identifier.
+        /// Narrator does not announce this due to: https://github.com/microsoft/microsoft-ui-xaml/issues/3469
+        /// </summary>
+        /// <param name="newValue">New Expanded state</param>
+        public void RaiseExpandedChangedEvent(bool newValue)
+        {
+            ExpandCollapseState newState = (newValue == true) ?
+              ExpandCollapseState.Expanded :
+              ExpandCollapseState.Collapsed;
+
+            ExpandCollapseState oldState = (newState == ExpandCollapseState.Expanded) ?
+              ExpandCollapseState.Collapsed :
+              ExpandCollapseState.Expanded;
+
+#if !HAS_UNO
+            RaisePropertyChangedEvent(ExpandCollapsePatternIdentifiers.ExpandCollapseStateProperty, oldState, newState);
+#endif
+        }
+    }
+}
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpanderItemStyleSelector.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpanderItemStyleSelector.cs
new file mode 100644
index 0000000..118d8b1
--- /dev/null
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpanderItemStyleSelector.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace iNKORE.UI.WPF.Modern.Controls
+{
+
+    /// <summary>
+    /// <see cref="StyleSelector"/> used by <see cref="SettingsExpander"/> to choose the proper <see cref="SettingsCard"/> container style (clickable or not).
+    /// </summary>
+    public class SettingsExpanderItemStyleSelector : StyleSelector
+    {
+        /// <summary>
+        /// Gets or sets the default <see cref="Style"/>.
+        /// </summary>
+        public Style DefaultStyle { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Style"/> when clickable.
+        /// </summary>
+        public Style ClickableStyle { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SettingsExpanderItemStyleSelector"/> class.
+        /// </summary>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        public SettingsExpanderItemStyleSelector()
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+        {
+        }
+
+        /// <inheritdoc/>
+        public override Style SelectStyle(object item, DependencyObject container)
+        {
+            if (container is SettingsCard card && card.IsClickEnabled)
+            {
+                return ClickableStyle;
+            }
+            else
+            {
+                return DefaultStyle;
+            }
+        }
+    }
+}
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Themes/Generic.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Themes/Generic.xaml
index b404e03..b45b791 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Themes/Generic.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Themes/Generic.xaml
@@ -29,7 +29,8 @@
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/ProgressBar/ProgressBar.xaml" />
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/ProgressRing/ProgressRing.xaml" />
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/RatingControl/RatingControl.xaml" />
-        <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/SettingsControls/SettingsCard.xaml" />
+        <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/SettingsControls/SettingsCard/SettingsCard.xaml" />
+        <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml" />
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/SplitButton/SplitButton.xaml" />
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/SplitView/SplitView.xaml" />
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/RadioButtons/RadioButtons.xaml" />

From f35e0bf2d9db1c88c571b4d638ea76c788cc78e4 Mon Sep 17 00:00:00 2001
From: Yoojun Zhou <hereisnotyoojun@outlook.com>
Date: Mon, 12 Aug 2024 15:47:29 +0800
Subject: [PATCH 3/8] It can work now

---
 samples/SettingsNavigationTest/MainPage.xaml  | 66 +++++++++++++++++++
 .../SettingsExpander.ItemsControl.cs          |  8 ++-
 .../SettingsExpander/SettingsExpander.xaml    |  1 +
 3 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/samples/SettingsNavigationTest/MainPage.xaml b/samples/SettingsNavigationTest/MainPage.xaml
index 28f6a20..0f07243 100644
--- a/samples/SettingsNavigationTest/MainPage.xaml
+++ b/samples/SettingsNavigationTest/MainPage.xaml
@@ -32,6 +32,71 @@
                 <ComboBoxItem Content="Yandex"/>
             </ComboBox>
         </ui:SettingsCard>
+
+        <ui:SettingsExpander x:Name="settingsCard"
+                            Description="The SettingsExpander has the same properties as a Card, and you can set SettingsCard as part of the Items collection."
+                            Header="SettingsExpander">
+            <ui:SettingsExpander.HeaderIcon>
+                <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Home}"/>
+            </ui:SettingsExpander.HeaderIcon>
+            <!--  TODO: This should be TwoWay bound but throws compile error in Uno.  -->
+            <ComboBox SelectedIndex="0">
+                <ComboBoxItem>Option 1</ComboBoxItem>
+                <ComboBoxItem>Option 2</ComboBoxItem>
+                <ComboBoxItem>Option 3</ComboBoxItem>
+            </ComboBox>
+
+            <ui:SettingsExpander.Items>
+                <ui:SettingsCard Header="A basic SettingsCard within an SettingsExpander">
+                    <Button Content="Button" />
+                </ui:SettingsCard>
+                <ui:SettingsCard Description="SettingsCard within an Expander can be made clickable too!"
+                                Header="This item can be clicked"
+                                IsClickEnabled="True" />
+
+                <ui:SettingsCard ContentAlignment="Left">
+                    <CheckBox Content="Here the ContentAlignment is set to Left. This is great for e.g. CheckBoxes or RadioButtons." />
+                </ui:SettingsCard>
+
+                <ui:SettingsCard HorizontalContentAlignment="Left"
+                                ContentAlignment="Vertical"
+                                Description="You can also align your content vertically. Make sure to set the HorizontalAlignment to Left when you do!"
+                                Header="Vertically aligned">
+                    <ui:GridView SelectedIndex="1">
+                        <ui:GridViewItem>
+                            <Border Width="64"
+                                Height="64"
+                                Background="#0078D4"
+                                CornerRadius="4" />
+                        </ui:GridViewItem>
+                        <ui:GridViewItem>
+                            <Border Width="64"
+                                Height="64"
+                                Background="#005EB7"
+                                CornerRadius="4" />
+                        </ui:GridViewItem>
+                        <ui:GridViewItem>
+                            <Border Width="64"
+                                Height="64"
+                                Background="#003D92"
+                                CornerRadius="4" />
+                        </ui:GridViewItem>
+                        <ui:GridViewItem>
+                            <Border Width="64"
+                                Height="64"
+                                Background="#001968"
+                                CornerRadius="4" />
+                        </ui:GridViewItem>
+                    </ui:GridView>
+                </ui:SettingsCard>
+                <ui:SettingsCard Description="You can override the Left indention of a SettingsCard by overriding the SettingsCardLeftIndention"
+                                Header="Customization">
+
+                </ui:SettingsCard>
+            </ui:SettingsExpander.Items>
+        </ui:SettingsExpander>
+
+
         <ui:SettingsCard Header="Sidebar"
                          Description="Provides many useful tools.">
             <ui:SettingsCard.HeaderIcon>
@@ -46,5 +111,6 @@
             </ui:SettingsCard.HeaderIcon>
             <ui:ToggleSwitch HorizontalContentAlignment="Right"/>
         </ui:SettingsCard>
+
     </ikw:SimpleStackPanel>
 </Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.ItemsControl.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.ItemsControl.cs
index 6c402de..a146e04 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.ItemsControl.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.ItemsControl.cs
@@ -5,6 +5,8 @@
 using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Markup;
+using System.Collections;
 
 namespace iNKORE.UI.WPF.Modern.Controls
 {
@@ -12,14 +14,14 @@ namespace iNKORE.UI.WPF.Modern.Controls
     //// Implement properties for ItemsControl like behavior.
     public partial class SettingsExpander
     {
-        public IList<object> Items
+        public IList Items
         {
-            get { return (IList<object>)GetValue(ItemsProperty); }
+            get { return (IList)GetValue(ItemsProperty); }
             set { SetValue(ItemsProperty, value); }
         }
 
         public static readonly DependencyProperty ItemsProperty =
-            DependencyProperty.Register(nameof(Items), typeof(IList<object>), typeof(SettingsExpander), new PropertyMetadata(null, OnItemsConnectedPropertyChanged));
+            DependencyProperty.Register(nameof(Items), typeof(IList), typeof(SettingsExpander), new PropertyMetadata(null, OnItemsConnectedPropertyChanged));
 
         public object ItemsSource
         {
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
index 206a5ed..a0757f9 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
@@ -350,6 +350,7 @@
                                     FontFamily="{TemplateBinding FontFamily}"
                                     Header="{TemplateBinding Header}"
                                     HeaderIcon="{TemplateBinding HeaderIcon}"
+                                    IsHitTestVisible="False"
                                     IsClickEnabled="False" />
                             </Expander.Header>
                             <Expander.Content>

From 8dcc027bcc5601a8d13c6e24da4f03bc35e7f76b Mon Sep 17 00:00:00 2001
From: Yoojun Zhou <hereisnotyoojun@outlook.com>
Date: Mon, 12 Aug 2024 16:23:46 +0800
Subject: [PATCH 4/8] Some fixes

---
 .../SettingsCard/SettingsCard.cs              | 20 +++++++-
 .../SettingsExpander.Properties.cs            | 12 -----
 .../SettingsExpander/SettingsExpander.xaml    | 46 +++++++++----------
 .../Themes/ThemeResources.xaml                | 25 ++++++++++
 4 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
index 07714dd..a214572 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
@@ -136,6 +136,22 @@ private void DisableButtonInteraction()
             //PreviewKeyUp -= Control_PreviewKeyUp;
         }
 
+        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+
+            if (!this.IsClickEnabled)
+                e.Handled = false;
+        }
+        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonUp(e);
+
+            if (!this.IsClickEnabled)
+                e.Handled = false;
+        }
+
+
         //private void Control_PreviewKeyUp(object sender, KeyEventArgs e)
         //{
         //    if (e.Key == Key.Enter || e.Key == Key.Space) //  || e.Key == Key.GamepadA
@@ -168,7 +184,7 @@ private void DisableButtonInteraction()
         //protected override void OnMouseDown(MouseButtonEventArgs e)
         //{
         //    base.OnMouseDown(e);
-            
+
         //    if (IsClickEnabled && IsEnabled)
         //    {
         //        this.IsPressed = true;
@@ -196,7 +212,7 @@ private void DisableButtonInteraction()
         //protected override void OnMouseLeave(MouseEventArgs e)
         //{
         //    base.OnMouseLeave(e);
-            
+
         //    if (IsClickEnabled && IsEnabled)
         //        VisualStateManager.GoToState(this, NormalState, true);
         //}
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Properties.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Properties.cs
index af64e82..75833d4 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Properties.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.Properties.cs
@@ -87,18 +87,6 @@ public partial class SettingsExpander
          typeof(SettingsExpander),
          new PropertyMetadata(defaultValue: false, (d, e) => ((SettingsExpander)d).OnIsExpandedPropertyChanged((bool)e.OldValue, (bool)e.NewValue)));
 
-
-        /// <summary>
-        /// 
-        /// <summary>
-        /// Gets or sets the CornerRadius.
-        /// </summary>
-        public CornerRadius CornerRadius
-        {
-            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
-            set { SetValue(CornerRadiusProperty, value); }
-        }
-
         /// <summary>
         /// 
         /// <summary>
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
index a0757f9..c09fc6c 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
@@ -4,22 +4,14 @@
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers;assembly=iNKORE.UI.WPF.Modern"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/SettingsControls/SettingsCard/SettingsCard.xaml" />
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Controls/Expander.xaml" />
+        <ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/ThemeResources.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <sys:String x:Key="SettingsExpanderChevronToolTip">Show all settings</sys:String>
-    <Thickness x:Key="SettingsExpanderHeaderPadding">16,16,4,16</Thickness>
-    <Thickness x:Key="SettingsExpanderItemPadding">58,8,44,8</Thickness>
-    <Thickness x:Key="SettingsExpanderItemBorderThickness">0,1,0,0</Thickness>
-    <Thickness x:Key="ClickableSettingsExpanderItemPadding">58,8,16,8</Thickness>
-    <sys:Double x:Key="SettingsExpanderContentMinHeight">16</sys:Double>
-    <sys:Double x:Key="SettingsExpanderChevronButtonWidth">32</sys:Double>
-    <sys:Double x:Key="SettingsExpanderChevronButtonHeight">32</sys:Double>
-
     <CornerRadiusConverter x:Key="CornerRadiusConverter" />
 
     <Style
@@ -30,7 +22,8 @@
             <Setter Property="BorderThickness" Value="{DynamicResource SettingsExpanderItemBorderThickness}" />
             <Setter Property="MinHeight" Value="52" />
             <Setter Property="Padding" Value="{DynamicResource SettingsExpanderItemPadding}" />
-            <Setter Property="chelper:ControlHelper.CornerRadius" Value="0" />
+            <Setter Property="ui:ControlHelper.CornerRadius" Value="0" />
+
         </Style.Setters>
     </Style>
 
@@ -66,7 +59,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{DynamicResource ExpanderHeaderBorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}">
+                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
                         <Grid SnapsToDevicePixels="False">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
@@ -166,6 +159,11 @@
         </Setter>
     </Style>
 
+    <ikw:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
+    <ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
+    <ikw:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
+    <ikw:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
+
 
     <Style x:Key="SettingsExpanderExpanderStyle" TargetType="Expander">
         <Setter Property="IsTabStop" Value="False" />
@@ -177,7 +175,7 @@
         <Setter Property="Padding" Value="0" />
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="chelper:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
@@ -202,6 +200,7 @@
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
                             IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
                             IsEnabled="{TemplateBinding IsEnabled}"
                             IsTabStop="True"
                             Style="{StaticResource SettingsExpanderHeaderDownStyle}" />
@@ -215,7 +214,7 @@
                                 VerticalAlignment="Stretch"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{DynamicResource ExpanderContentDownBorderThickness}"
-                                CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                                CornerRadius="{Binding Path=(ui:ControlHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
                                 Visibility="Collapsed">
                                 <ContentPresenter
                                     Margin="0,-2,0,0"
@@ -241,14 +240,14 @@
                             <Setter TargetName="ExpanderHeader" Property="VerticalContentAlignment" Value="Stretch" />
                             <Setter TargetName="ExpanderHeader" Property="HorizontalContentAlignment" Value="Center" />
                             <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentRightBorderThickness}" />
-                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource RightCornerRadiusFilterConverter}}" />
                             <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Right" />
                             <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Left" />
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Up">
                             <Setter TargetName="ExpanderHeader" Property="Style" Value="{DynamicResource ExpanderCardHeaderUpStyle}" />
                             <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentUpBorderThickness}" />
-                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource TopCornerRadiusFilterConverter}}" />
                             <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Top" />
                             <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Bottom" />
                         </Trigger>
@@ -258,7 +257,7 @@
                             <Setter TargetName="ExpanderHeader" Property="VerticalContentAlignment" Value="Stretch" />
                             <Setter TargetName="ExpanderHeader" Property="HorizontalContentAlignment" Value="Center" />
                             <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentLeftBorderThickness}" />
-                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
                             <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Left" />
                             <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Right" />
                         </Trigger>
@@ -272,7 +271,7 @@
                                 <Condition Property="ExpandDirection" Value="Down" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ExpanderHeader" Property="chelper:ControlHelper.CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource TopCornerRadiusFilterConverter}}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <MultiTrigger>
@@ -281,7 +280,7 @@
                                 <Condition Property="ExpandDirection" Value="Right" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ExpanderHeader" Property="chelper:ControlHelper.CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <MultiTrigger>
@@ -290,7 +289,7 @@
                                 <Condition Property="ExpandDirection" Value="Up" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ExpanderHeader" Property="chelper:ControlHelper.CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <MultiTrigger>
@@ -299,7 +298,7 @@
                                 <Condition Property="ExpandDirection" Value="Left" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ExpanderHeader" Property="chelper:ControlHelper.CornerRadius" Value="{Binding Tag, ElementName=ExpanderHeader, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource RightCornerRadiusFilterConverter}}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>
@@ -314,7 +313,7 @@
             <Setter Property="Foreground" Value="{DynamicResource SettingsCardForeground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource SettingsCardBorderBrush}" />
             <Setter Property="BorderThickness" Value="{DynamicResource SettingsCardBorderThickness}" />
-            <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+            <Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
             <Setter Property="MinHeight" Value="{DynamicResource SettingsCardMinHeight}" />
             <Setter Property="MinWidth" Value="{DynamicResource SettingsCardMinWidth}" />
             <Setter Property="IsTabStop" Value="False" />
@@ -343,14 +342,13 @@
                                 <local:SettingsCard
                                     Padding="{StaticResource SettingsExpanderHeaderPadding}"
                                     VerticalAlignment="Center"
-                                    Background="Transparent"
+                                    Background="{x:Null}"
                                     BorderThickness="0"
                                     Content="{TemplateBinding Content}"
                                     Description="{TemplateBinding Description}"
                                     FontFamily="{TemplateBinding FontFamily}"
                                     Header="{TemplateBinding Header}"
                                     HeaderIcon="{TemplateBinding HeaderIcon}"
-                                    IsHitTestVisible="False"
                                     IsClickEnabled="False" />
                             </Expander.Header>
                             <Expander.Content>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/ThemeResources.xaml b/source/iNKORE.UI.WPF.Modern/Themes/ThemeResources.xaml
index d581424..c4ffb96 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/ThemeResources.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/ThemeResources.xaml
@@ -545,4 +545,29 @@
     <sys:Double x:Key="TreeViewItemPillMinScale">0.625</sys:Double>
     <KeyTime x:Key="TreeViewItemScaleAnimationDuration">00:00:00.167</KeyTime>
 
+    <sys:String x:Key="SettingsExpanderChevronToolTip">Show all settings</sys:String>
+    <Thickness x:Key="SettingsExpanderHeaderPadding">16,16,4,16</Thickness>
+    <Thickness x:Key="SettingsExpanderItemPadding">58,8,44,8</Thickness>
+    <Thickness x:Key="SettingsExpanderItemBorderThickness">0,1,0,0</Thickness>
+    <Thickness x:Key="ClickableSettingsExpanderItemPadding">58,8,16,8</Thickness>
+    <sys:Double x:Key="SettingsExpanderContentMinHeight">16</sys:Double>
+    <sys:Double x:Key="SettingsExpanderChevronButtonWidth">32</sys:Double>
+    <sys:Double x:Key="SettingsExpanderChevronButtonHeight">32</sys:Double>
+
+    <Thickness x:Key="SettingsCardBorderThickness">1</Thickness>
+    <Thickness x:Key="SettingsCardPadding">16,16,16,16</Thickness>
+    <sys:Double x:Key="SettingsCardMinWidth">148</sys:Double>
+    <sys:Double x:Key="SettingsCardMinHeight">68</sys:Double>
+    <sys:Double x:Key="SettingsCardDescriptionFontSize">12</sys:Double>
+    <sys:Double x:Key="SettingsCardHeaderIconMaxSize">20</sys:Double>
+    <sys:Double x:Key="SettingsCardLeftIndention">0</sys:Double>
+    <sys:Double x:Key="SettingsCardContentMinWidth">120</sys:Double>
+    <Thickness x:Key="SettingsCardHeaderIconMargin">2,0,20,0</Thickness>
+    <Thickness x:Key="SettingsCardActionIconMargin">14,0,0,0</Thickness>
+    <sys:Double x:Key="SettingsCardActionIconMaxSize">13</sys:Double>
+    <sys:Double x:Key="SettingsCardVerticalHeaderContentSpacing">8</sys:Double>
+    <sys:Double x:Key="SettingsCardWrapThreshold">476</sys:Double>
+    <sys:Double x:Key="SettingsCardWrapNoIconThreshold">286</sys:Double>
+
+
 </ResourceDictionary>
\ No newline at end of file

From b1ad9f24b528b5a1873c1779dfb65ff9453b9b16 Mon Sep 17 00:00:00 2001
From: swety2003 <swety2003@outlook.com>
Date: Mon, 12 Aug 2024 17:18:07 +0800
Subject: [PATCH 5/8] Fix root CornerRadius

---
 .../SettingsExpander/SettingsExpander.xaml    | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
index c09fc6c..ceda1d7 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsExpander/SettingsExpander.xaml
@@ -2,9 +2,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers;assembly=iNKORE.UI.WPF.Modern"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf">
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/SettingsControls/SettingsCard/SettingsCard.xaml" />
@@ -193,6 +194,7 @@
                             HorizontalAlignment="Stretch"
                             HorizontalContentAlignment="{DynamicResource ExpanderHeaderHorizontalContentAlignment}"
                             VerticalContentAlignment="{DynamicResource ExpanderHeaderVerticalContentAlignment}"
+                            ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
                             Background="{DynamicResource ExpanderHeaderBackground}"
                             BorderBrush="{DynamicResource ExpanderHeaderBorderBrush}"
                             BorderThickness="{DynamicResource ExpanderHeaderBorderThickness}"
@@ -200,10 +202,10 @@
                             ContentTemplate="{TemplateBinding HeaderTemplate}"
                             ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
                             IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                            ui:ControlHelper.CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
                             IsEnabled="{TemplateBinding IsEnabled}"
                             IsTabStop="True"
-                            Style="{StaticResource SettingsExpanderHeaderDownStyle}" />
+                            Style="{StaticResource SettingsExpanderHeaderDownStyle}"
+                            Tag="{TemplateBinding chelper:ControlHelper.CornerRadius}" />
                         <!--  The clip is a composition clip applied in code  -->
                         <Border x:Name="ExpanderContentClip" Grid.Row="1">
                             <Border
@@ -214,7 +216,7 @@
                                 VerticalAlignment="Stretch"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{DynamicResource ExpanderContentDownBorderThickness}"
-                                CornerRadius="{Binding Path=(ui:ControlHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                                CornerRadius="{Binding ElementName=ExpanderHeader, Path=Tag, Converter={StaticResource BottomCornerRadiusFilterConverter}}"
                                 Visibility="Collapsed">
                                 <ContentPresenter
                                     Margin="0,-2,0,0"
@@ -240,14 +242,14 @@
                             <Setter TargetName="ExpanderHeader" Property="VerticalContentAlignment" Value="Stretch" />
                             <Setter TargetName="ExpanderHeader" Property="HorizontalContentAlignment" Value="Center" />
                             <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentRightBorderThickness}" />
-                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding ElementName=ExpanderHeader, Path=Tag, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
                             <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Right" />
                             <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Left" />
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Up">
                             <Setter TargetName="ExpanderHeader" Property="Style" Value="{DynamicResource ExpanderCardHeaderUpStyle}" />
                             <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentUpBorderThickness}" />
-                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding ElementName=ExpanderHeader, Path=Tag, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
                             <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Top" />
                             <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Bottom" />
                         </Trigger>
@@ -257,7 +259,7 @@
                             <Setter TargetName="ExpanderHeader" Property="VerticalContentAlignment" Value="Stretch" />
                             <Setter TargetName="ExpanderHeader" Property="HorizontalContentAlignment" Value="Center" />
                             <Setter TargetName="ExpanderContent" Property="BorderThickness" Value="{DynamicResource ExpanderContentLeftBorderThickness}" />
-                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                            <Setter TargetName="ExpanderContent" Property="CornerRadius" Value="{Binding ElementName=ExpanderHeader, Path=Tag, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
                             <Setter TargetName="ExpanderContentClip" Property="DockPanel.Dock" Value="Left" />
                             <Setter TargetName="ExpanderHeader" Property="DockPanel.Dock" Value="Right" />
                         </Trigger>
@@ -271,7 +273,7 @@
                                 <Condition Property="ExpandDirection" Value="Down" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource TopCornerRadiusFilterConverter}}" />
+                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding ElementName=ExpanderHeader, Path=Tag, Converter={StaticResource TopCornerRadiusFilterConverter}}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <MultiTrigger>
@@ -280,7 +282,7 @@
                                 <Condition Property="ExpandDirection" Value="Right" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
+                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding ElementName=ExpanderHeader, Path=Tag, Converter={StaticResource LeftCornerRadiusFilterConverter}}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <MultiTrigger>
@@ -289,7 +291,7 @@
                                 <Condition Property="ExpandDirection" Value="Up" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
+                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding ElementName=ExpanderHeader, Path=Tag, Converter={StaticResource BottomCornerRadiusFilterConverter}}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                         <MultiTrigger>
@@ -298,7 +300,7 @@
                                 <Condition Property="ExpandDirection" Value="Left" />
                             </MultiTrigger.Conditions>
                             <MultiTrigger.Setters>
-                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding Path=(ui:ControlHelper.CornerRadius), Converter={StaticResource RightCornerRadiusFilterConverter}}" />
+                                <Setter TargetName="ExpanderHeader" Property="ui:ControlHelper.CornerRadius" Value="{Binding ElementName=ExpanderHeader, Path=Tag, Converter={StaticResource RightCornerRadiusFilterConverter}}" />
                             </MultiTrigger.Setters>
                         </MultiTrigger>
                     </ControlTemplate.Triggers>

From 79b24e78b729a1d5b8ceca540feb5244f3bb2bc3 Mon Sep 17 00:00:00 2001
From: Yoojun Zhou <hereisnotyoojun@outlook.com>
Date: Mon, 12 Aug 2024 17:44:54 +0800
Subject: [PATCH 6/8] Update MainWindow.xaml

---
 samples/SettingsNavigationTest/MainWindow.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/SettingsNavigationTest/MainWindow.xaml b/samples/SettingsNavigationTest/MainWindow.xaml
index fb1453d..2a5f816 100644
--- a/samples/SettingsNavigationTest/MainWindow.xaml
+++ b/samples/SettingsNavigationTest/MainWindow.xaml
@@ -9,13 +9,13 @@
         ui:ThemeManager.IsThemeAware="True"
         ui:WindowHelper.SystemBackdropType="Mica"
         ui:WindowHelper.UseModernWindowStyle="True"
-        Title="SettingsNavigationTest" Height="450" Width="800">
+        Title="SettingsNavigationTest" Height="756" Width="800">
     <Grid Margin="25,15,15,15">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <TextBlock Text="Settings" FontSize="28" Grid.Row="0"/>
-        <ui:Frame x:Name="SettingsFrame" Grid.Row="1" Margin="0,20,0,0"/>
+        <ui:Frame x:Name="SettingsFrame" Grid.Row="1" Margin="0,20,0,0" ScrollViewer.VerticalScrollBarVisibility="Auto"/>
     </Grid>
 </Window>

From 18615bd33a1ce1f280ea378df7d669f16771bb65 Mon Sep 17 00:00:00 2001
From: Yoojun Zhou <hereisnotyoojun@outlook.com>
Date: Wed, 14 Aug 2024 22:50:22 +0800
Subject: [PATCH 7/8] ContentAlignment now works

---
 .../SettingsCard/SettingsCard.Properties.cs   |  10 +-
 .../SettingsCard/SettingsCard.cs              |  47 ++++++
 .../SettingsCard/SettingsCard.xaml            | 135 +++++++++++++-----
 3 files changed, 153 insertions(+), 39 deletions(-)

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.Properties.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.Properties.cs
index c5cbc98..2f7557e 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.Properties.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.Properties.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Windows;
 
 namespace iNKORE.UI.WPF.Modern.Controls
@@ -69,7 +70,7 @@ public partial class SettingsCard
             nameof(ContentAlignment),
             typeof(ContentAlignment),
             typeof(SettingsCard),
-            new PropertyMetadata(defaultValue: ContentAlignment.Right));
+            new PropertyMetadata(defaultValue: ContentAlignment.Right, (d, e) => ((SettingsCard)d).OnContentAlignmentPropertyChanged((ContentAlignment)e.OldValue, (ContentAlignment)e.NewValue)));
 
         /// <summary>
         /// The backing <see cref="DependencyProperty"/> for the <see cref="IsActionIconVisible"/> property.
@@ -177,6 +178,12 @@ protected virtual void OnIsActionIconVisiblePropertyChanged(bool oldValue, bool
         {
             OnActionIconChanged();
         }
+
+        protected virtual void OnContentAlignmentPropertyChanged(ContentAlignment oldValue, ContentAlignment newValue)
+        {
+            this.UpdateContentAlignmentState();
+        }
+        
     }
 
     public enum ContentAlignment
@@ -194,5 +201,4 @@ public enum ContentAlignment
         /// </summary>
         Vertical
     }
-
 }
\ No newline at end of file
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
index a214572..b615e56 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
@@ -83,10 +83,16 @@ public override void OnApplyTemplate()
             SetAccessibleContentName();
 
             IsEnabledChanged += OnIsEnabledChanged;
+            SizeChanged += SettingsCard_SizeChanged;
 
             // RegisterPropertyChangedCallback(ContentProperty, OnContentChanged);
         }
 
+        private void SettingsCard_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            this.UpdateContentAlignmentState();
+        }
+
         private static void ContentProperty_ValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (d is SettingsCard control)
@@ -152,6 +158,7 @@ protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
         }
 
 
+
         //private void Control_PreviewKeyUp(object sender, KeyEventArgs e)
         //{
         //    if (e.Key == Key.Enter || e.Key == Key.Space) //  || e.Key == Key.GamepadA
@@ -244,6 +251,46 @@ private void UpdatePointerState()
             VisualStateManager.GoToState(this, state, true);
         }
 
+        private void UpdateContentAlignmentState()
+        {
+            string state = null;
+
+            if (this.ContentAlignment == ContentAlignment.Left)
+            {
+                state = LeftState;
+            }
+            else if (this.ContentAlignment == ContentAlignment.Vertical)
+            {
+                state = VerticalState;
+            }
+            else
+            {
+                var SettingsCardWrapNoIconThreshold = this.FindResource("SettingsCardWrapNoIconThreshold") as double?;
+                var SettingsCardWrapThreshold = this.FindResource("SettingsCardWrapThreshold") as double?;
+
+                if (SettingsCardWrapThreshold != null && SettingsCardWrapThreshold != null)
+                {
+                    if (this.ActualWidth < SettingsCardWrapNoIconThreshold)
+                    {
+                        state = RightWrappedNoIconState;
+                    }
+                    else if (this.ActualWidth < SettingsCardWrapThreshold)
+                    {
+                        state = RightWrappedState;
+                    }
+                    else
+                    {
+                        state = RightState;
+                    }
+                }
+            }
+
+            if (state != null)
+            {
+                VisualStateManager.GoToState(this, state, true);
+            }
+        }
+
         /// <summary>
         /// Creates AutomationPeer
         /// </summary>
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml
index adc18d3..f041c37 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml
@@ -99,16 +99,19 @@
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardBackgroundPointerOver}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_RootBorder"
                                                    Storyboard.TargetProperty="BorderBrush">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardBorderBrushPointerOver}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderPresenter"
                                                    Storyboard.TargetProperty="Foreground">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardForegroundPointerOver}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderIconPresenter"
                                                    Storyboard.TargetProperty="Foreground">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
@@ -126,21 +129,25 @@
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardBackgroundPressed}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_RootBorder"
                                                    Storyboard.TargetProperty="BorderBrush">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardBorderBrushPressed}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderIconPresenter"
                                                    Storyboard.TargetProperty="Foreground">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardForegroundPressed}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderPresenter"
                                                    Storyboard.TargetProperty="Foreground">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardForegroundPressed}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_DescriptionPresenter"
                                                    Storyboard.TargetProperty="Foreground">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
@@ -158,16 +165,19 @@
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardForegroundDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderIconPresenter"
                                                    Storyboard.TargetProperty="Foreground">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardForegroundDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderPresenter"
                                                    Storyboard.TargetProperty="Foreground">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
                                                 Value="{DynamicResource SettingsCardForegroundDisabled}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_DescriptionPresenter"
                                                    Storyboard.TargetProperty="Foreground">
                                                 <DiscreteObjectKeyFrame KeyTime="0"
@@ -190,18 +200,30 @@
                                     <!--  Whenever the control width is less than SettingsCardWrapThreshold, the Content is below the Header/Description  -->
                                     <VisualState x:Name="RightWrapped">
                                         <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Grid.Row">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Grid.Column">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                            </ObjectAnimationUsingKeyFrames>
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(Grid.Row)">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <sys:Int32>1</sys:Int32>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                            
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(Grid.Column)">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <sys:Int32>1</sys:Int32>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalAlignment">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Stretch" />
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static HorizontalAlignment.Stretch}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalContentAlignment">
+                                            
+                                            <!--<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalContentAlignment">
                                                 <DiscreteObjectKeyFrame KeyTime="0" Value="Left" />
-                                            </ObjectAnimationUsingKeyFrames>
+                                            </ObjectAnimationUsingKeyFrames>-->
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderPanel" Storyboard.TargetProperty="Margin">
                                                 <DiscreteObjectKeyFrame KeyTime="0" Value="0" />
                                             </ObjectAnimationUsingKeyFrames>
@@ -214,18 +236,23 @@
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderIconPresenterHolder" Storyboard.TargetProperty="Visibility">
                                                 <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Grid.Row">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Grid.Column">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                            </ObjectAnimationUsingKeyFrames>
+
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(Grid.Column)">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <sys:Int32>1</sys:Int32>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalAlignment">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Stretch" />
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static HorizontalAlignment.Left}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalContentAlignment">
+                                            
+                                            <!--<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalContentAlignment">
                                                 <DiscreteObjectKeyFrame KeyTime="0" Value="Left" />
-                                            </ObjectAnimationUsingKeyFrames>
+                                            </ObjectAnimationUsingKeyFrames>-->
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderPanel" Storyboard.TargetProperty="Margin">
                                                 <DiscreteObjectKeyFrame KeyTime="0" Value="0" />
                                             </ObjectAnimationUsingKeyFrames>
@@ -235,23 +262,38 @@
                                     <!--  Header/Description/Icon collapsed, content is to the left. Great for e.g. Checkboxes  -->
                                     <VisualState x:Name="Left">
                                         <Storyboard>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderIconPresenterHolder" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed" />
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_HeaderPresenter" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed" />
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
                                             </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_DescriptionPresenter" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Grid.Row">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Grid.Column">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
+                                            </ObjectAnimationUsingKeyFrames>
+                                            
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(Grid.Row)">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <sys:Int32>1</sys:Int32>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                            
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(Grid.Column)">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <sys:Int32>1</sys:Int32>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
                                             </ObjectAnimationUsingKeyFrames>
+
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalAlignment">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Stretch" />
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static HorizontalAlignment.Stretch}" />
                                             </ObjectAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>
@@ -259,17 +301,36 @@
                                     <!--  Similiar to Left, but the HeaderIcon/Header/Description is visible  -->
                                     <VisualState x:Name="Vertical">
                                         <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Grid.Row">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Grid.Column">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
-                                            </ObjectAnimationUsingKeyFrames>
+                                            
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(Grid.Row)">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <sys:Int32>1</sys:Int32>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                            
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(Grid.Column)">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <sys:Int32>1</sys:Int32>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                            
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalAlignment">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Stretch" />
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static HorizontalAlignment.Stretch}" />
                                             </ObjectAnimationUsingKeyFrames>
-                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalContentAlignment">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource TemplatedParent}}" />
+                                            <!--<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="HorizontalAlignment">
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:SettingsCard}}" />
+                                            </ObjectAnimationUsingKeyFrames>-->
+
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Margin">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Thickness>0,5,0,0</Thickness>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
                                             </ObjectAnimationUsingKeyFrames>
 
                                         </Storyboard>

From 93ac676b5bc18aa7b6e3c551bc316ae0d98a2c4c Mon Sep 17 00:00:00 2001
From: Yoojun Zhou <hereisnotyoojun@outlook.com>
Date: Wed, 14 Aug 2024 22:57:50 +0800
Subject: [PATCH 8/8] Implement UpdateContentVisibilityStates

---
 .../SettingsCard/SettingsCard.cs                | 17 ++++++++++++++++-
 .../SettingsCard/SettingsCard.xaml              |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
index b615e56..12a963a 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.cs
@@ -54,7 +54,6 @@ static SettingsCard()
         internal static readonly DependencyPropertyDescriptor IsPressedPropertyDescriptior = DependencyPropertyDescriptor.FromProperty(IsPressedProperty, typeof(SettingsCard));
         internal static readonly DependencyPropertyDescriptor IsMouseOverPropertyDescriptior = DependencyPropertyDescriptor.FromProperty(IsMouseOverProperty, typeof(SettingsCard));
 
-
         /// <summary>
         /// Creates a new instance of the <see cref="SettingsCard"/> class.
         /// </summary>
@@ -98,6 +97,7 @@ private static void ContentProperty_ValueChanged(DependencyObject d, DependencyP
             if (d is SettingsCard control)
             {
                 control.OnContentChanged(e.OldValue, e.NewValue);
+                control.UpdateContentVisibilityStates();
             }
         }
 
@@ -253,6 +253,9 @@ private void UpdatePointerState()
 
         private void UpdateContentAlignmentState()
         {
+            // Manually go to states, adapted from:
+            // https://github.com/CommunityToolkit/Windows/blob/main/components/SettingsControls/src/SettingsCard/SettingsCard.xaml#L304-353
+
             string state = null;
 
             if (this.ContentAlignment == ContentAlignment.Left)
@@ -291,6 +294,18 @@ private void UpdateContentAlignmentState()
             }
         }
 
+        public void UpdateContentVisibilityStates()
+        {
+            // Manually go to states, adapted from:
+            // https://github.com/CommunityToolkit/Windows/blob/main/components/SettingsControls/src/SettingsCard/SettingsCard.xaml#L369
+            
+            var state = this.Content == null || this.Content as string == ""
+                ? nameof(Visibility.Collapsed)
+                : nameof(Visibility.Visible);
+
+            VisualStateManager.GoToState(this, state, true);
+        }
+
         /// <summary>
         /// Creates AutomationPeer
         /// </summary>
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml
index f041c37..58a73cc 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SettingsControls/SettingsCard/SettingsCard.xaml
@@ -344,7 +344,7 @@
                                     <VisualState x:Name="Collapsed">
                                         <Storyboard>
                                             <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="Visibility">
-                                                <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed" />
+                                                <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
                                             </ObjectAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualState>