From cb9bf96b73ac8ed7073982ad0c362638a900010c Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 19 Jul 2023 02:51:19 +0800
Subject: [PATCH] feat: rename theme index file.

---
 .../Controls/{Controls.axaml => _index.axaml}          |  3 +--
 src/Semi.Avalonia/Themes/Base.axaml                    | 10 +++-------
 .../Themes/Dark/{Dark.axaml => _index.axaml}           |  0
 src/Semi.Avalonia/Themes/DarkTheme.axaml               |  7 +++----
 src/Semi.Avalonia/Themes/Index.axaml                   |  7 +++----
 .../Themes/Light/{Light.axaml => _index.axaml}         |  0
 src/Semi.Avalonia/Themes/LightTheme.axaml              |  7 +++----
 7 files changed, 13 insertions(+), 21 deletions(-)
 rename src/Semi.Avalonia/Controls/{Controls.axaml => _index.axaml} (98%)
 rename src/Semi.Avalonia/Themes/Dark/{Dark.axaml => _index.axaml} (100%)
 rename src/Semi.Avalonia/Themes/Light/{Light.axaml => _index.axaml} (100%)

diff --git a/src/Semi.Avalonia/Controls/Controls.axaml b/src/Semi.Avalonia/Controls/_index.axaml
similarity index 98%
rename from src/Semi.Avalonia/Controls/Controls.axaml
rename to src/Semi.Avalonia/Controls/_index.axaml
index 7933d64..e8f6631 100644
--- a/src/Semi.Avalonia/Controls/Controls.axaml
+++ b/src/Semi.Avalonia/Controls/_index.axaml
@@ -2,7 +2,6 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     x:CompileBindings="True">
-    <!--  Add Resources Here  -->
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/AutoCompleteBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Border.axaml" />
@@ -61,4 +60,4 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Window.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/WindowNotificationManager.axaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Base.axaml b/src/Semi.Avalonia/Themes/Base.axaml
index c195896..2489219 100644
--- a/src/Semi.Avalonia/Themes/Base.axaml
+++ b/src/Semi.Avalonia/Themes/Base.axaml
@@ -1,8 +1,4 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
-    <!--  Add Resources Here  -->
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
             <SolidColorBrush x:Key="DefaultForeground" Color="#1C1F23" />
@@ -11,7 +7,7 @@
             <SolidColorBrush x:Key="DefaultForeground" Color="#F9F9F9" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
-    <sys:Double x:Key="DefaultFontSize">14</sys:Double>
+    <x:Double x:Key="DefaultFontSize">14</x:Double>
     <FontFamily x:Key="DefaultFontFamily">Inter, -apple-system,BlinkMacSystemFont,PingFang SC, Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,Helvetica,Arial,sans-serif</FontFamily>
     <FontFamily x:Key="CodeFontFamily">Cascadia Code, Consolas, Inconsolata, monospace</FontFamily>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Dark.axaml b/src/Semi.Avalonia/Themes/Dark/_index.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Dark/Dark.axaml
rename to src/Semi.Avalonia/Themes/Dark/_index.axaml
diff --git a/src/Semi.Avalonia/Themes/DarkTheme.axaml b/src/Semi.Avalonia/Themes/DarkTheme.axaml
index 62739ee..c4ee2ae 100644
--- a/src/Semi.Avalonia/Themes/DarkTheme.axaml
+++ b/src/Semi.Avalonia/Themes/DarkTheme.axaml
@@ -1,15 +1,14 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/Dark.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/Controls.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
     <Style Selector=":is(UserControl)">
         <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
     </Style>
-</Styles>
+</Styles>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Index.axaml b/src/Semi.Avalonia/Themes/Index.axaml
index 3e5ed36..86c4758 100644
--- a/src/Semi.Avalonia/Themes/Index.axaml
+++ b/src/Semi.Avalonia/Themes/Index.axaml
@@ -2,11 +2,11 @@
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
-                <MergeResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/Light.axaml" />
-                <MergeResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/Dark.axaml" />
+                <MergeResourceInclude x:Key="Default" Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
+                <MergeResourceInclude x:Key="Dark" Source="avares://Semi.Avalonia/Themes/Dark/_index.axaml" />
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/Controls.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
@@ -15,5 +15,4 @@
     <Style Selector=":is(UserControl)">
         <Setter Property="Theme" Value="{DynamicResource {x:Type UserControl}}" />
     </Style>
-    <!--  Add Styles Here  -->
 </Styles>
diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/_index.axaml
similarity index 100%
rename from src/Semi.Avalonia/Themes/Light/Light.axaml
rename to src/Semi.Avalonia/Themes/Light/_index.axaml
diff --git a/src/Semi.Avalonia/Themes/LightTheme.axaml b/src/Semi.Avalonia/Themes/LightTheme.axaml
index c6b6155..00dced9 100644
--- a/src/Semi.Avalonia/Themes/LightTheme.axaml
+++ b/src/Semi.Avalonia/Themes/LightTheme.axaml
@@ -1,15 +1,14 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  Add Resources Here  -->
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Light.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/Controls.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/_index.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
     <Style Selector=":is(UserControl)">
         <Setter Property="Theme" Value="{StaticResource {x:Type UserControl}}" />
     </Style>
-</Styles>
+</Styles>
\ No newline at end of file