From 8e513bbbe4aaa65a02ab7f86e332535395bfe903 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Thu, 27 Jun 2024 18:11:11 +0100
Subject: [PATCH] Fixed issue where we couldn't enter a space into textbox
 within SettingsExpander

---
 .../PersonPictureColourGenerator.cs           | 13 +--
 .../SettingsExpander/SettingsExpander.axaml   | 93 +++++++++++++++++++
 .../SettingsExpander/SettingsExpander.cs      |  4 +-
 .../SettingsExpanderToggleButton.cs           | 16 ++++
 .../Themes/ControlResources.axaml             |  1 +
 5 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.axaml
 create mode 100644 Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpanderToggleButton.cs

diff --git a/Toolkit.UI.Controls.Avalonia/PersonPicture/PersonPictureColourGenerator.cs b/Toolkit.UI.Controls.Avalonia/PersonPicture/PersonPictureColourGenerator.cs
index 43c46f1..ea986ed 100644
--- a/Toolkit.UI.Controls.Avalonia/PersonPicture/PersonPictureColourGenerator.cs
+++ b/Toolkit.UI.Controls.Avalonia/PersonPicture/PersonPictureColourGenerator.cs
@@ -8,14 +8,15 @@ public class PersonPictureColourGenerator
 {
     private readonly string[] colours =
     [
-        "#FFB900", "#E81123", "#0078D7", "#0099BC", "#7A7574",
-        "#767676", "#FF8C00", "#E81123", "#0063B1", "#2D7D9A",
-        "#5D5A58", "#4C4A48", "#F7630C", "#EA005E", "#8E8CD8",
-        "#0078D7", "#68768A", "#69797E", "#CA5010", "#C30052",
-        "#6B69D6", "#038387", "#515C6B", "#4A5459", "#DA3B01",
-        "#E3008C", "#8764B8", "#00B294", "#567C73", "#647C64"
+        "#FFB900", "#FF8C00", "#F7630C", "#CA5010", "#DA3B01", "#EF6950", "#D13438", "#FF4343", 
+        "#E74856", "#E81123", "#EA005E", "#C30052", "#E3008C", "#BF0077", "#C239B3", "#9A0089", 
+        "#0078D7", "#0063B1", "#8E8CD8", "#6B69D6", "#8764B8", "#744DA9", "#B146C2", "#881798", 
+        "#0099BC", "#2D7D9A", "#00B7C3", "#038387", "#00B294", "#018574", "#00CC6A", "#10893E", 
+        "#7A7574", "#5D5A58", "#68768A", "#515C6B", "#567C73", "#486860", "#498205", "#107C10", 
+        "#767676", "#4C4A48", "#69797E", "#4A5459", "#647C64", "#525E54", "#847545", "#7E735F"
     ];
 
+
     public Color GenerateColour(string input)
     {
         byte[] hashBytes = GetHash(input);
diff --git a/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.axaml b/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.axaml
new file mode 100644
index 0000000..bc82278
--- /dev/null
+++ b/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.axaml
@@ -0,0 +1,93 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Toolkit.UI.Controls.Avalonia"
+    xmlns:ui="using:FluentAvalonia.UI.Controls">
+    <ControlTheme x:Key="SettingsExpanderExpanderStyle" TargetType="Expander">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="{DynamicResource SettingsExpanderMinHeight}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ExpanderContentBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ExpanderContentDownBorderThickness}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <StackPanel>
+                    <controls:SettingsExpanderToggleButton
+                        Name="ToggleButton"
+                        MinHeight="{TemplateBinding MinHeight}"
+                        Content="{TemplateBinding Header}"
+                        IsChecked="{TemplateBinding IsExpanded,
+                                                    Mode=TwoWay}"
+                        IsEnabled="{TemplateBinding IsEnabled}"
+                        Theme="{StaticResource SettingsExpanderToggleButtonStyle}" />
+
+                    <Border
+                        Name="ExpanderContent"
+                        Background="{TemplateBinding Background}"
+                        BackgroundSizing="InnerBorderEdge"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius,
+                                                       Converter={StaticResource BottomCornerRadiusFilterConverter}}"
+                        IsVisible="False">
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            IsVisible="{TemplateBinding IsExpanded}" />
+                    </Border>
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:expanded /template/ Border#ExpanderContent">
+            <Setter Property="IsVisible" Value="True" />
+        </Style>
+    </ControlTheme>
+    <ControlTheme x:Key="{x:Type ui:SettingsExpander}" TargetType="ui:SettingsExpander">
+        <Setter Property="Background" Value="{DynamicResource ExpanderBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ExpanderHeaderBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ExpanderHeaderBorderThickness}" />
+        <Setter Property="Padding" Value="{DynamicResource SettingsExpanderPadding}" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="MinHeight" Value="{DynamicResource SettingsExpanderMinHeight}" />
+        <Setter Property="ItemsPanel">
+            <ItemsPanelTemplate>
+                <StackPanel Spacing="1" />
+            </ItemsPanelTemplate>
+        </Setter>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Expander
+                    Name="Expander"
+                    IsExpanded="{TemplateBinding IsExpanded,
+                                                 Mode=TwoWay}"
+                    Theme="{StaticResource SettingsExpanderExpanderStyle}">
+                    <Expander.Header>
+                        <ui:SettingsExpanderItem
+                            Name="ContentHost"
+                            Padding="{DynamicResource SettingsExpanderPadding}"
+                            ActionIconSource="{TemplateBinding ActionIconSource}"
+                            Background="Transparent"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            Description="{TemplateBinding Description}"
+                            Footer="{TemplateBinding Footer}"
+                            FooterTemplate="{TemplateBinding FooterTemplate}"
+                            IconSource="{TemplateBinding IconSource}"
+                            IsClickEnabled="{TemplateBinding IsClickEnabled}" />
+                    </Expander.Header>
+
+                    <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
+                </Expander>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:empty /template/ ItemsPresenter#ItemsHost">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.cs b/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.cs
index f8e6c18..9117ce2 100644
--- a/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.cs
+++ b/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpander.cs
@@ -1,6 +1,4 @@
-using Avalonia;
-
-namespace Toolkit.UI.Controls.Avalonia;
+namespace Toolkit.UI.Controls.Avalonia;
 
 public class SettingsExpander : FluentAvalonia.UI.Controls.SettingsExpander
 {
diff --git a/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpanderToggleButton.cs b/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpanderToggleButton.cs
new file mode 100644
index 0000000..257690e
--- /dev/null
+++ b/Toolkit.UI.Controls.Avalonia/SettingsExpander/SettingsExpanderToggleButton.cs
@@ -0,0 +1,16 @@
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+
+namespace Toolkit.UI.Controls.Avalonia;
+
+public class SettingsExpanderToggleButton : 
+    ToggleButton
+{
+    protected override void OnKeyDown(KeyEventArgs args)
+    {
+        if (args.Key is not Key.Space)
+        {
+            base.OnKeyDown(args);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Toolkit.UI.Controls.Avalonia/Themes/ControlResources.axaml b/Toolkit.UI.Controls.Avalonia/Themes/ControlResources.axaml
index 3eceab9..8003c5d 100644
--- a/Toolkit.UI.Controls.Avalonia/Themes/ControlResources.axaml
+++ b/Toolkit.UI.Controls.Avalonia/Themes/ControlResources.axaml
@@ -5,6 +5,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <MergeResourceInclude Source="../CarouselView/CarouselView.axaml" />
                 <MergeResourceInclude Source="../PersonPicture/PersonPicture.axaml" />
+                <MergeResourceInclude Source="../SettingsExpander/SettingsExpander.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>