From a8d1073f752eea50ba54d6a0d34a8c0eb375efc2 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sun, 18 Feb 2024 17:30:30 +0800
Subject: [PATCH] feat: improve demo, add dynamic resource.

---
 demo/Ursa.Demo/Pages/FormDemo.axaml           | 82 +++++++++----------
 src/Ursa.Themes.Semi/Controls/Form.axaml      |  4 +-
 src/Ursa.Themes.Semi/Themes/Dark/Form.axaml   |  5 ++
 src/Ursa.Themes.Semi/Themes/Dark/_index.axaml |  1 +
 src/Ursa.Themes.Semi/Themes/Light/Form.axaml  |  5 ++
 .../Themes/Light/_index.axaml                 |  1 +
 src/Ursa/Controls/Form/Form.cs                |  1 +
 7 files changed, 56 insertions(+), 43 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Dark/Form.axaml
 create mode 100644 src/Ursa.Themes.Semi/Themes/Light/Form.axaml

diff --git a/demo/Ursa.Demo/Pages/FormDemo.axaml b/demo/Ursa.Demo/Pages/FormDemo.axaml
index 49988ff..61423b2 100644
--- a/demo/Ursa.Demo/Pages/FormDemo.axaml
+++ b/demo/Ursa.Demo/Pages/FormDemo.axaml
@@ -12,47 +12,47 @@
     x:CompileBindings="True"
     x:DataType="vm:FormDemoViewModel"
     mc:Ignorable="d">
-    <StackPanel>
+    <ScrollViewer>
         <StackPanel>
-            <u:EnumSelector
-                Name="position"
-                EnumType="common:Position"
-                Value="{x:Static common:Position.Top}" />
-            <u:EnumSelector
-                Name="alignment"
-                EnumType="HorizontalAlignment"
-                Value="{x:Static HorizontalAlignment.Left}" />
+            <Grid RowDefinitions="Auto, Auto" ColumnDefinitions="Auto, Auto">
+                <TextBlock Grid.Row="0" Grid.Column="0" Text="Label Position" VerticalAlignment="Center"></TextBlock>
+                <TextBlock Grid.Row="1" Grid.Column="0" Text="Label Alignment" VerticalAlignment="Center"></TextBlock>
+                <u:EnumSelector Grid.Row="0" Grid.Column="1"
+                    Name="position"
+                    EnumType="common:Position"
+                    Value="{x:Static common:Position.Top}" />
+                <u:EnumSelector Grid.Row="1" Grid.Column="1"
+                    Name="alignment"
+                    EnumType="HorizontalAlignment"
+                    Value="{x:Static HorizontalAlignment.Left}" />
+            </Grid>
+            <u:Form
+                DataContext="{Binding Model}"
+                LabelAlignment="{Binding #alignment.Value}"
+                LabelPosition="{Binding #position.Value}"
+                LabelWidth="*">
+                <u:FormGroup Header="Information">
+                    <TextBox
+                        Width="300"
+                        u:FormItem.IsRequired="True"
+                        u:FormItem.Label="Name"
+                        Text="{Binding Name}" />
+                    <TextBox
+                        Width="300"
+                        u:FormItem.Label="Email"
+                        Text="{Binding Email}" />
+                </u:FormGroup>
+                <u:FormItem Label="Please select a Date">
+                    <CalendarDatePicker SelectedDate="{Binding Date}" />
+                </u:FormItem>
+                <u:FormItem Label="Click to Submit">
+                    <Button Content="Button With Label" />
+                </u:FormItem>
+                <CheckBox Content="I Agree User Agreement" u:FormItem.NoLabel="True"></CheckBox>
+                <u:FormItem NoLabel="True">
+                    <Button HorizontalAlignment="Left" Content="No Label" />
+                </u:FormItem>
+            </u:Form>
         </StackPanel>
-        <u:Form
-            DataContext="{Binding Model}"
-            LabelAlignment="{Binding #alignment.Value}"
-            LabelPosition="{Binding #position.Value}"
-            LabelWidth="*">
-            <u:FormGroup Header="Information">
-                <TextBox
-                    Width="300"
-                    u:FormItem.IsRequired="True"
-                    u:FormItem.Label="Name"
-                    Text="{Binding Name}" />
-                <TextBox
-                    Width="300"
-                    u:FormItem.Label="Email"
-                    Text="{Binding Email}" />
-            </u:FormGroup>
-            <u:FormItem Label="Please select a Date">
-                <Calendar SelectedDate="{Binding Date}" />
-            </u:FormItem>
-            <u:FormItem Label="Click to Submit">
-                <Button Content="With Label" />
-            </u:FormItem>
-            <u:FormItem NoLabel="True">
-                <Button HorizontalAlignment="Left" Content="No Label" />
-            </u:FormItem>
-        </u:Form>
-        <StackPanel>
-            <TextBlock Text="{Binding Model.Name}" />
-            <TextBlock Text="{Binding Model.Email}" />
-            <TextBlock Text="{Binding Model.Date}" />
-        </StackPanel>
-    </StackPanel>
+    </ScrollViewer>
 </UserControl>
diff --git a/src/Ursa.Themes.Semi/Controls/Form.axaml b/src/Ursa.Themes.Semi/Controls/Form.axaml
index 9543a31..355414c 100644
--- a/src/Ursa.Themes.Semi/Controls/Form.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Form.axaml
@@ -22,12 +22,12 @@
         <Setter Property="Template">
             <ControlTemplate TargetType="u:FormGroup">
                 <StackPanel>
-                    <ContentPresenter Content="{TemplateBinding Header}" FontWeight="Bold" />
+                    <ContentPresenter Content="{TemplateBinding Header}" FontWeight="Bold" FontSize="18" />
                     <Rectangle
                         Height="1"
                         Margin="0,8"
                         HorizontalAlignment="Stretch"
-                        Fill="LightGray" />
+                        Fill="{DynamicResource FormGroupBorderBrush}" />
                     <ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
                 </StackPanel>
             </ControlTemplate>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/Form.axaml b/src/Ursa.Themes.Semi/Themes/Dark/Form.axaml
new file mode 100644
index 0000000..64b7836
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Dark/Form.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush x:Key="FormGroupBorderBrush" Color="White" Opacity="0.08"></SolidColorBrush>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
index f42dc2f..073516b 100644
--- a/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Dark/_index.axaml
@@ -7,6 +7,7 @@
         <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
+        <MergeResourceInclude Source="Form.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
         <MergeResourceInclude Source="KeyGestureInput.axaml" />
         <MergeResourceInclude Source="Loading.axaml" />
diff --git a/src/Ursa.Themes.Semi/Themes/Light/Form.axaml b/src/Ursa.Themes.Semi/Themes/Light/Form.axaml
new file mode 100644
index 0000000..64a484e
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Light/Form.axaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!-- Add Resources Here -->
+    <SolidColorBrush x:Key="FormGroupBorderBrush" Color="#FF1C1F23" Opacity="0.08"></SolidColorBrush>
+</ResourceDictionary>
diff --git a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
index f42dc2f..073516b 100644
--- a/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Light/_index.axaml
@@ -7,6 +7,7 @@
         <MergeResourceInclude Source="Dialog.axaml" />
         <MergeResourceInclude Source="Divider.axaml" />
         <MergeResourceInclude Source="DualBadge.axaml" />
+        <MergeResourceInclude Source="Form.axaml" />
         <MergeResourceInclude Source="IPv4Box.axaml" />
         <MergeResourceInclude Source="KeyGestureInput.axaml" />
         <MergeResourceInclude Source="Loading.axaml" />
diff --git a/src/Ursa/Controls/Form/Form.cs b/src/Ursa/Controls/Form/Form.cs
index bef2b44..8110b99 100644
--- a/src/Ursa/Controls/Form/Form.cs
+++ b/src/Ursa/Controls/Form/Form.cs
@@ -70,6 +70,7 @@ public class Form: ItemsControl
             Content = control,
             [!FormItem.LabelProperty] = control[!FormItem.LabelProperty],
             [!FormItem.IsRequiredProperty] = control[!FormItem.IsRequiredProperty],
+            [!FormItem.NoLabelProperty] = control[!FormItem.NoLabelProperty],
         };
     }
 }
\ No newline at end of file