From 049552f2546e1a9ce6588e65467742ef627b5593 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Mon, 30 Dec 2024 12:21:28 +0800
Subject: [PATCH] feat: rearrange Resource tree.

---
 demo/Semi.Avalonia.Demo/App.axaml                    |  4 ++--
 src/Semi.Avalonia/{Themes => }/Index.axaml           | 11 ++++++++---
 .../AquaticScheme.axaml}                             |  0
 .../DarkTheme.axaml => Schemes/DarkScheme.axaml}     |  0
 .../DesertTheme.axaml => Schemes/DesertScheme.axaml} |  0
 .../DuskTheme.axaml => Schemes/DuskScheme.axaml}     |  0
 .../LightTheme.axaml => Schemes/LightScheme.axaml}   |  0
 .../NightSkyScheme.axaml}                            |  0
 src/Semi.Avalonia/{Themes => }/SemiTheme.axaml       | 12 ++++++------
 src/Semi.Avalonia/{Themes => }/SemiTheme.axaml.cs    |  0
 src/Semi.Avalonia/Themes/DarkTheme.axaml             | 11 -----------
 src/Semi.Avalonia/Themes/LightTheme.axaml            | 11 -----------
 12 files changed, 16 insertions(+), 33 deletions(-)
 rename src/Semi.Avalonia/{Themes => }/Index.axaml (57%)
 rename src/Semi.Avalonia/{Themes/Schemes/AquaticTheme.axaml => Schemes/AquaticScheme.axaml} (100%)
 rename src/Semi.Avalonia/{Themes/Schemes/DarkTheme.axaml => Schemes/DarkScheme.axaml} (100%)
 rename src/Semi.Avalonia/{Themes/Schemes/DesertTheme.axaml => Schemes/DesertScheme.axaml} (100%)
 rename src/Semi.Avalonia/{Themes/Schemes/DuskTheme.axaml => Schemes/DuskScheme.axaml} (100%)
 rename src/Semi.Avalonia/{Themes/Schemes/LightTheme.axaml => Schemes/LightScheme.axaml} (100%)
 rename src/Semi.Avalonia/{Themes/Schemes/NightSkyTheme.axaml => Schemes/NightSkyScheme.axaml} (100%)
 rename src/Semi.Avalonia/{Themes => }/SemiTheme.axaml (76%)
 rename src/Semi.Avalonia/{Themes => }/SemiTheme.axaml.cs (100%)
 delete mode 100644 src/Semi.Avalonia/Themes/DarkTheme.axaml
 delete mode 100644 src/Semi.Avalonia/Themes/LightTheme.axaml

diff --git a/demo/Semi.Avalonia.Demo/App.axaml b/demo/Semi.Avalonia.Demo/App.axaml
index c3605fa..3de4aaa 100644
--- a/demo/Semi.Avalonia.Demo/App.axaml
+++ b/demo/Semi.Avalonia.Demo/App.axaml
@@ -5,8 +5,8 @@
     xmlns:semi="https://irihi.tech/semi">
     <Application.Styles>
         <!-- You can still reference in old way.  -->
-        <!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
-        <semi:SemiTheme Locale="zh-cn" />
+        <!-- <StyleInclude Source="avares://Semi.Avalonia/Index.axaml" /> -->
+        <semi:SemiTheme Locale="zh-CN" />
         <semi:SemiPopupAnimations/>
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Index.axaml b/src/Semi.Avalonia/Index.axaml
similarity index 57%
rename from src/Semi.Avalonia/Themes/Index.axaml
rename to src/Semi.Avalonia/Index.axaml
index dc9ff25..013498e 100644
--- a/src/Semi.Avalonia/Themes/Index.axaml
+++ b/src/Semi.Avalonia/Index.axaml
@@ -1,9 +1,14 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:semi="https://irihi.tech/semi">
     <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/Schemes/LightScheme.axaml" />
+                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Schemes/DarkScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Schemes/AquaticScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Schemes/DesertScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="avares://Semi.Avalonia/Schemes/DuskScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Schemes/NightSkyScheme.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml b/src/Semi.Avalonia/Schemes/AquaticScheme.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Schemes/AquaticTheme.axaml
rename to src/Semi.Avalonia/Schemes/AquaticScheme.axaml
diff --git a/src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml b/src/Semi.Avalonia/Schemes/DarkScheme.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Schemes/DarkTheme.axaml
rename to src/Semi.Avalonia/Schemes/DarkScheme.axaml
diff --git a/src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml b/src/Semi.Avalonia/Schemes/DesertScheme.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Schemes/DesertTheme.axaml
rename to src/Semi.Avalonia/Schemes/DesertScheme.axaml
diff --git a/src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml b/src/Semi.Avalonia/Schemes/DuskScheme.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Schemes/DuskTheme.axaml
rename to src/Semi.Avalonia/Schemes/DuskScheme.axaml
diff --git a/src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml b/src/Semi.Avalonia/Schemes/LightScheme.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Schemes/LightTheme.axaml
rename to src/Semi.Avalonia/Schemes/LightScheme.axaml
diff --git a/src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml b/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml
rename to src/Semi.Avalonia/Schemes/NightSkyScheme.axaml
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml
similarity index 76%
rename from src/Semi.Avalonia/Themes/SemiTheme.axaml
rename to src/Semi.Avalonia/SemiTheme.axaml
index 3412a7f..8d158b8 100644
--- a/src/Semi.Avalonia/Themes/SemiTheme.axaml
+++ b/src/Semi.Avalonia/SemiTheme.axaml
@@ -3,12 +3,12 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <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" />
-                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Themes/Schemes/NightSkyTheme.axaml" />
+                <ResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Schemes/LightScheme.axaml" />
+                <ResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Schemes/DarkScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="avares://Semi.Avalonia/Schemes/AquaticScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="avares://Semi.Avalonia/Schemes/DesertScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.Dusk}" Source="avares://Semi.Avalonia/Schemes/DuskScheme.axaml" />
+                <ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="avares://Semi.Avalonia/Schemes/NightSkyScheme.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml.cs b/src/Semi.Avalonia/SemiTheme.axaml.cs
similarity index 100%
rename from src/Semi.Avalonia/Themes/SemiTheme.axaml.cs
rename to src/Semi.Avalonia/SemiTheme.axaml.cs
diff --git a/src/Semi.Avalonia/Themes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/DarkTheme.axaml
deleted file mode 100644
index 393d404..0000000
--- a/src/Semi.Avalonia/Themes/DarkTheme.axaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/LightTheme.axaml b/src/Semi.Avalonia/Themes/LightTheme.axaml
deleted file mode 100644
index aeae5cc..0000000
--- a/src/Semi.Avalonia/Themes/LightTheme.axaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Styles.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Styles.Resources>
-</Styles>
\ No newline at end of file