From dbae6edf403b26ec62a134cfc00f14c878e8675e Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 26 Dec 2024 00:29:16 +0800
Subject: [PATCH] feat: extract icon resources.

---
 demo/Semi.Avalonia.Demo/ViewModels/IconDemoViewModel.cs    | 2 +-
 src/Semi.Avalonia/{Themes/Shared => Icons}/Icon.axaml      | 0
 src/Semi.Avalonia/{Themes/Shared => Icons}/IconPatch.axaml | 0
 src/Semi.Avalonia/Icons/_index.axaml                       | 6 ++++++
 src/Semi.Avalonia/Themes/Index.axaml                       | 3 ++-
 src/Semi.Avalonia/Themes/SemiTheme.axaml                   | 1 +
 src/Semi.Avalonia/Themes/Shared/_index.axaml               | 2 --
 7 files changed, 10 insertions(+), 4 deletions(-)
 rename src/Semi.Avalonia/{Themes/Shared => Icons}/Icon.axaml (100%)
 rename src/Semi.Avalonia/{Themes/Shared => Icons}/IconPatch.axaml (100%)
 create mode 100644 src/Semi.Avalonia/Icons/_index.axaml

diff --git a/demo/Semi.Avalonia.Demo/ViewModels/IconDemoViewModel.cs b/demo/Semi.Avalonia.Demo/ViewModels/IconDemoViewModel.cs
index 09e8fc8..d58a546 100644
--- a/demo/Semi.Avalonia.Demo/ViewModels/IconDemoViewModel.cs
+++ b/demo/Semi.Avalonia.Demo/ViewModels/IconDemoViewModel.cs
@@ -12,7 +12,7 @@ namespace Semi.Avalonia.Demo.ViewModels;
 public partial class IconDemoViewModel : ObservableObject
 {
     private readonly IResourceDictionary? _resources =
-        AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Themes/Shared/Icon.axaml")) as ResourceDictionary;
+        AvaloniaXamlLoader.Load(new Uri("avares://Semi.Avalonia/Icons/Icon.axaml")) as ResourceDictionary;
 
     private readonly Dictionary<string, IconItem> _filledIcons = new();
     private readonly Dictionary<string, IconItem> _strokedIcons = new();
diff --git a/src/Semi.Avalonia/Themes/Shared/Icon.axaml b/src/Semi.Avalonia/Icons/Icon.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Shared/Icon.axaml
rename to src/Semi.Avalonia/Icons/Icon.axaml
diff --git a/src/Semi.Avalonia/Themes/Shared/IconPatch.axaml b/src/Semi.Avalonia/Icons/IconPatch.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Shared/IconPatch.axaml
rename to src/Semi.Avalonia/Icons/IconPatch.axaml
diff --git a/src/Semi.Avalonia/Icons/_index.axaml b/src/Semi.Avalonia/Icons/_index.axaml
new file mode 100644
index 0000000..0158800
--- /dev/null
+++ b/src/Semi.Avalonia/Icons/_index.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/Icons/Icon.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Icons/IconPatch.axaml" />
+    </ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Index.axaml b/src/Semi.Avalonia/Themes/Index.axaml
index 116b7b5..dc9ff25 100644
--- a/src/Semi.Avalonia/Themes/Index.axaml
+++ b/src/Semi.Avalonia/Themes/Index.axaml
@@ -10,7 +10,8 @@
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Icons/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
-</Styles>
+</Styles>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/SemiTheme.axaml b/src/Semi.Avalonia/Themes/SemiTheme.axaml
index 5281aa0..7b03e4d 100644
--- a/src/Semi.Avalonia/Themes/SemiTheme.axaml
+++ b/src/Semi.Avalonia/Themes/SemiTheme.axaml
@@ -15,6 +15,7 @@
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Icons/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
diff --git a/src/Semi.Avalonia/Themes/Shared/_index.axaml b/src/Semi.Avalonia/Themes/Shared/_index.axaml
index 94e39c2..7d03eff 100644
--- a/src/Semi.Avalonia/Themes/Shared/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml
@@ -1,8 +1,6 @@
 <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" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/Icon.axaml" />
-        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/IconPatch.axaml" />
         <!--  Controls  -->
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AdornerLayer.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml" />