From 0eb138d73c98c535ad613973d55d7913f704235d Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 26 Dec 2024 01:42:18 +0800
Subject: [PATCH] feat: redesign schemes.

---
 .../ViewModels/PaletteDemoViewModel.cs                   | 5 +++--
 src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs           | 9 ---------
 src/Semi.Avalonia/Themes/Dark/_index.axaml               | 2 --
 src/Semi.Avalonia/Themes/Light/Palette.axaml.cs          | 9 ---------
 src/Semi.Avalonia/Themes/Light/_index.axaml              | 2 --
 src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml         | 6 ++++++
 src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml        | 6 ++++++
 src/Semi.Avalonia/Themes/SemiTheme.axaml                 | 4 ++--
 src/Semi.Avalonia/Themes/Shared/Palette.axaml            | 2 --
 src/Semi.Avalonia/Themes/Shared/_index.axaml             | 2 --
 .../Dark/Palette.axaml => Tokens/Palette/Dark.axaml}     | 2 +-
 src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs           | 5 +++++
 .../Light/Palette.axaml => Tokens/Palette/Light.axaml}   | 2 +-
 src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs          | 5 +++++
 14 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs
 delete mode 100644 src/Semi.Avalonia/Themes/Light/Palette.axaml.cs
 create mode 100644 src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml
 create mode 100644 src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml
 delete mode 100644 src/Semi.Avalonia/Themes/Shared/Palette.axaml
 rename src/Semi.Avalonia/{Themes/Dark/Palette.axaml => Tokens/Palette/Dark.axaml} (99%)
 create mode 100644 src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs
 rename src/Semi.Avalonia/{Themes/Light/Palette.axaml => Tokens/Palette/Light.axaml} (99%)
 create mode 100644 src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs

diff --git a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
index cf23454..ac572b4 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/PaletteDemoViewModel.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Media;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
+using Semi.Avalonia.Tokens.Palette;
 
 namespace Semi.Avalonia.Demo.ViewModels;
 
@@ -51,8 +52,8 @@ public class PaletteDemoViewModel : ObservableObject
 
     public PaletteDemoViewModel()
     {
-        _lightResourceDictionary = new Light.Palette();
-        _darkResourceDictionary = new Dark.Palette();
+        _lightResourceDictionary = new Light();
+        _darkResourceDictionary = new Dark();
         WeakReferenceMessenger.Default.Register<PaletteDemoViewModel, ColorItemViewModel>(this, OnClickColorItem);
     }
 
diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs b/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs
deleted file mode 100644
index 196931f..0000000
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Semi.Avalonia.Dark;
-
-public class Palette: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/_index.axaml b/src/Semi.Avalonia/Themes/Dark/_index.axaml
index 017f040..b2620b9 100644
--- a/src/Semi.Avalonia/Themes/Dark/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/_index.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Palette.axaml" />
-        <!--  Controls  -->
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Border.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs b/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs
deleted file mode 100644
index e391acb..0000000
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Semi.Avalonia.Light;
-
-public class Palette: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/_index.axaml b/src/Semi.Avalonia/Themes/Light/_index.axaml
index c747222..6ce2972 100644
--- a/src/Semi.Avalonia/Themes/Light/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Light/_index.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Palette.axaml" />
-        <!--  Controls  -->
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Border.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml
new file mode 100644
index 0000000..0666d38
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Palette/Dark.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml b/src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml
new file mode 100644
index 0000000..28a6714
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml
@@ -0,0 +1,6 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Palette/Light.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml
index 978f91f..3412a7f 100644
--- a/src/Semi.Avalonia/Themes/SemiTheme.axaml
+++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml
@@ -3,8 +3,8 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
-                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
+                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Schemes/LightTheme.axaml" />
+                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Schemes/DarkTheme.axaml" />
                 <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml" />
                 <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Themes/Schemes/DesertTheme.axaml" />
                 <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="avares://Semi.Avalonia/Themes/Schemes/DuskTheme.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Shared/Palette.axaml b/src/Semi.Avalonia/Themes/Shared/Palette.axaml
deleted file mode 100644
index d1981be..0000000
--- a/src/Semi.Avalonia/Themes/Shared/Palette.axaml
+++ /dev/null
@@ -1,2 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/_index.axaml b/src/Semi.Avalonia/Themes/Shared/_index.axaml
index 7d03eff..20cdaf7 100644
--- a/src/Semi.Avalonia/Themes/Shared/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml
@@ -1,7 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Palette.axaml" />
-        <!--  Controls  -->
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Border.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Dark/Palette.axaml b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml
similarity index 99%
rename from src/Semi.Avalonia/Themes/Dark/Palette.axaml
rename to src/Semi.Avalonia/Tokens/Palette/Dark.axaml
index 9d52d2e..a2146f5 100644
--- a/src/Semi.Avalonia/Themes/Dark/Palette.axaml
+++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary x:Class="Semi.Avalonia.Dark.Palette" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary x:Class="Semi.Avalonia.Tokens.Palette.Dark" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Color Resources  -->
     <Color x:Key="SemiRed0Color">#6C090B</Color>
     <Color x:Key="SemiRed1Color">#901110</Color>
diff --git a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs
new file mode 100644
index 0000000..3debf2a
--- /dev/null
+++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml.cs
@@ -0,0 +1,5 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Tokens.Palette;
+
+public class Dark : ResourceDictionary;
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Palette.axaml b/src/Semi.Avalonia/Tokens/Palette/Light.axaml
similarity index 99%
rename from src/Semi.Avalonia/Themes/Light/Palette.axaml
rename to src/Semi.Avalonia/Tokens/Palette/Light.axaml
index af79721..673e4ce 100644
--- a/src/Semi.Avalonia/Themes/Light/Palette.axaml
+++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml
@@ -1,4 +1,4 @@
-<ResourceDictionary x:Class="Semi.Avalonia.Light.Palette" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary x:Class="Semi.Avalonia.Tokens.Palette.Light" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!--  Color Resources  -->
     <Color x:Key="SemiRed0Color">#FEF2ED</Color>
     <Color x:Key="SemiRed1Color">#FEDDD2</Color>
diff --git a/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs b/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs
new file mode 100644
index 0000000..44a15af
--- /dev/null
+++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml.cs
@@ -0,0 +1,5 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Tokens.Palette;
+
+public class Light : ResourceDictionary;
\ No newline at end of file