From a2a36dbfcf5da23640bb1108f1c9b29325fa644a Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 29 May 2025 17:07:24 +0800
Subject: [PATCH] misc: simplify resources include paths and clean up XAML
formatting.
---
.../Controls/_index.axaml | 10 +-
src/Semi.Avalonia.ColorPicker/Index.axaml | 8 +-
src/Semi.Avalonia.DataGrid/Index.axaml | 8 +-
src/Semi.Avalonia.TreeDataGrid/Index.axaml | 8 +-
.../Animations/SemiPopupAnimations.axaml | 9 +-
.../Animations/SemiPopupAnimations.axaml.cs | 5 +-
src/Semi.Avalonia/Controls/_index.axaml | 112 +++++++++---------
src/Semi.Avalonia/Icons/_index.axaml | 9 +-
src/Semi.Avalonia/Index.axaml | 24 ++--
src/Semi.Avalonia/Locale/_index.cs | 21 ++++
src/Semi.Avalonia/Locale/de-de.axaml | 7 +-
src/Semi.Avalonia/Locale/de-de.axaml.cs | 8 --
src/Semi.Avalonia/Locale/en-us.axaml.cs | 8 --
src/Semi.Avalonia/Locale/es-es.axaml.cs | 8 --
src/Semi.Avalonia/Locale/ja-jp.axaml | 2 +-
src/Semi.Avalonia/Locale/ja-jp.axaml.cs | 8 --
src/Semi.Avalonia/Locale/pl-pl.axaml.cs | 8 --
src/Semi.Avalonia/Locale/ru-ru.axaml.cs | 8 --
src/Semi.Avalonia/Locale/uk-ua.axaml.cs | 8 --
src/Semi.Avalonia/Locale/zh-cn.axaml.cs | 8 --
src/Semi.Avalonia/Locale/zh-tw.axaml.cs | 8 --
src/Semi.Avalonia/Schemes/AquaticScheme.axaml | 4 +-
src/Semi.Avalonia/Schemes/DarkScheme.axaml | 4 +-
src/Semi.Avalonia/Schemes/DesertScheme.axaml | 4 +-
src/Semi.Avalonia/Schemes/DuskScheme.axaml | 4 +-
src/Semi.Avalonia/Schemes/LightScheme.axaml | 4 +-
.../Schemes/NightSkyScheme.axaml | 4 +-
src/Semi.Avalonia/SemiTheme.axaml | 24 ++--
src/Semi.Avalonia/Styles/_index.axaml | 4 +-
src/Semi.Avalonia/Themes/Dark/_index.axaml | 86 +++++++-------
.../Themes/HighContrast/_index.axaml | 86 +++++++-------
src/Semi.Avalonia/Themes/Light/_index.axaml | 86 +++++++-------
src/Semi.Avalonia/Themes/Shared/_index.axaml | 86 +++++++-------
src/Semi.Avalonia/Tokens/Palette/Dark.axaml | 5 +-
src/Semi.Avalonia/Tokens/Palette/Light.axaml | 5 +-
35 files changed, 329 insertions(+), 372 deletions(-)
create mode 100644 src/Semi.Avalonia/Locale/_index.cs
delete mode 100644 src/Semi.Avalonia/Locale/de-de.axaml.cs
delete mode 100644 src/Semi.Avalonia/Locale/en-us.axaml.cs
delete mode 100644 src/Semi.Avalonia/Locale/es-es.axaml.cs
delete mode 100644 src/Semi.Avalonia/Locale/ja-jp.axaml.cs
delete mode 100644 src/Semi.Avalonia/Locale/pl-pl.axaml.cs
delete mode 100644 src/Semi.Avalonia/Locale/ru-ru.axaml.cs
delete mode 100644 src/Semi.Avalonia/Locale/uk-ua.axaml.cs
delete mode 100644 src/Semi.Avalonia/Locale/zh-cn.axaml.cs
delete mode 100644 src/Semi.Avalonia/Locale/zh-tw.axaml.cs
diff --git a/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml b/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml
index d18df4d..cb68870 100644
--- a/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml
@@ -3,10 +3,10 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia.ColorPicker/Index.axaml b/src/Semi.Avalonia.ColorPicker/Index.axaml
index 2d4da5d..c2e551f 100644
--- a/src/Semi.Avalonia.ColorPicker/Index.axaml
+++ b/src/Semi.Avalonia.ColorPicker/Index.axaml
@@ -2,12 +2,12 @@
-
-
+
+
-
-
+
+
diff --git a/src/Semi.Avalonia.DataGrid/Index.axaml b/src/Semi.Avalonia.DataGrid/Index.axaml
index 4d798eb..c20a7a0 100644
--- a/src/Semi.Avalonia.DataGrid/Index.axaml
+++ b/src/Semi.Avalonia.DataGrid/Index.axaml
@@ -2,12 +2,12 @@
-
-
+
+
-
-
+
+
diff --git a/src/Semi.Avalonia.TreeDataGrid/Index.axaml b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
index 4165bb7..d7d886b 100644
--- a/src/Semi.Avalonia.TreeDataGrid/Index.axaml
+++ b/src/Semi.Avalonia.TreeDataGrid/Index.axaml
@@ -2,12 +2,12 @@
-
-
+
+
-
-
+
+
diff --git a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
index 3cf0c44..21c6443 100644
--- a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
+++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml
@@ -1,7 +1,8 @@
-
+
diff --git a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs
index 00d769e..8b766c2 100644
--- a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs
+++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs
@@ -2,7 +2,4 @@ using Avalonia.Styling;
namespace Semi.Avalonia;
-public class SemiPopupAnimations: Styles
-{
-
-}
\ No newline at end of file
+public class SemiPopupAnimations : Styles;
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/_index.axaml b/src/Semi.Avalonia/Controls/_index.axaml
index 425ce0c..b65b3a1 100644
--- a/src/Semi.Avalonia/Controls/_index.axaml
+++ b/src/Semi.Avalonia/Controls/_index.axaml
@@ -3,61 +3,61 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Icons/_index.axaml b/src/Semi.Avalonia/Icons/_index.axaml
index 48d4869..71b74fa 100644
--- a/src/Semi.Avalonia/Icons/_index.axaml
+++ b/src/Semi.Avalonia/Icons/_index.axaml
@@ -1,6 +1,9 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Index.axaml b/src/Semi.Avalonia/Index.axaml
index 1f16c58..4fcd2e7 100644
--- a/src/Semi.Avalonia/Index.axaml
+++ b/src/Semi.Avalonia/Index.axaml
@@ -4,22 +4,22 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/_index.cs b/src/Semi.Avalonia/Locale/_index.cs
new file mode 100644
index 0000000..f024267
--- /dev/null
+++ b/src/Semi.Avalonia/Locale/_index.cs
@@ -0,0 +1,21 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Locale;
+
+public class de_de : ResourceDictionary;
+
+public class en_us : ResourceDictionary;
+
+public class es_es : ResourceDictionary;
+
+public class ja_jp : ResourceDictionary;
+
+public class pl_pl : ResourceDictionary;
+
+public class ru_ru : ResourceDictionary;
+
+public class uk_ua : ResourceDictionary;
+
+public class zh_cn : ResourceDictionary;
+
+public class zh_tw : ResourceDictionary;
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/de-de.axaml b/src/Semi.Avalonia/Locale/de-de.axaml
index 8b1fd67..ebb4b3e 100644
--- a/src/Semi.Avalonia/Locale/de-de.axaml
+++ b/src/Semi.Avalonia/Locale/de-de.axaml
@@ -1,6 +1,7 @@
-
+
Tag
Monat
diff --git a/src/Semi.Avalonia/Locale/de-de.axaml.cs b/src/Semi.Avalonia/Locale/de-de.axaml.cs
deleted file mode 100644
index 76dcfb7..0000000
--- a/src/Semi.Avalonia/Locale/de-de.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class de_de : ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/en-us.axaml.cs b/src/Semi.Avalonia/Locale/en-us.axaml.cs
deleted file mode 100644
index f9a9730..0000000
--- a/src/Semi.Avalonia/Locale/en-us.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class en_us: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/es-es.axaml.cs b/src/Semi.Avalonia/Locale/es-es.axaml.cs
deleted file mode 100644
index 0f4284d..0000000
--- a/src/Semi.Avalonia/Locale/es-es.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class es_es: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/ja-jp.axaml b/src/Semi.Avalonia/Locale/ja-jp.axaml
index 18e7811..c9dbd6b 100644
--- a/src/Semi.Avalonia/Locale/ja-jp.axaml
+++ b/src/Semi.Avalonia/Locale/ja-jp.axaml
@@ -24,4 +24,4 @@
種類
サイズ
{0} はすでに存在します。置き換えますか?
-
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/ja-jp.axaml.cs b/src/Semi.Avalonia/Locale/ja-jp.axaml.cs
deleted file mode 100644
index d054d32..0000000
--- a/src/Semi.Avalonia/Locale/ja-jp.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class ja_jp: ResourceDictionary
-{
-
-}
diff --git a/src/Semi.Avalonia/Locale/pl-pl.axaml.cs b/src/Semi.Avalonia/Locale/pl-pl.axaml.cs
deleted file mode 100644
index 70a8200..0000000
--- a/src/Semi.Avalonia/Locale/pl-pl.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class pl_pl: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/ru-ru.axaml.cs b/src/Semi.Avalonia/Locale/ru-ru.axaml.cs
deleted file mode 100644
index ad9bc07..0000000
--- a/src/Semi.Avalonia/Locale/ru-ru.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class ru_ru : ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/uk-ua.axaml.cs b/src/Semi.Avalonia/Locale/uk-ua.axaml.cs
deleted file mode 100644
index 6387ed0..0000000
--- a/src/Semi.Avalonia/Locale/uk-ua.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class uk_ua : ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/zh-cn.axaml.cs b/src/Semi.Avalonia/Locale/zh-cn.axaml.cs
deleted file mode 100644
index 530a7de..0000000
--- a/src/Semi.Avalonia/Locale/zh-cn.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class zh_cn: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Locale/zh-tw.axaml.cs b/src/Semi.Avalonia/Locale/zh-tw.axaml.cs
deleted file mode 100644
index 18f4508..0000000
--- a/src/Semi.Avalonia/Locale/zh-tw.axaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Semi.Avalonia.Locale;
-
-public class zh_tw: ResourceDictionary
-{
-
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/AquaticScheme.axaml b/src/Semi.Avalonia/Schemes/AquaticScheme.axaml
index 4181245..251c757 100644
--- a/src/Semi.Avalonia/Schemes/AquaticScheme.axaml
+++ b/src/Semi.Avalonia/Schemes/AquaticScheme.axaml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/DarkScheme.axaml b/src/Semi.Avalonia/Schemes/DarkScheme.axaml
index 0666d38..9269f84 100644
--- a/src/Semi.Avalonia/Schemes/DarkScheme.axaml
+++ b/src/Semi.Avalonia/Schemes/DarkScheme.axaml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/DesertScheme.axaml b/src/Semi.Avalonia/Schemes/DesertScheme.axaml
index 6fdac84..90d53b7 100644
--- a/src/Semi.Avalonia/Schemes/DesertScheme.axaml
+++ b/src/Semi.Avalonia/Schemes/DesertScheme.axaml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/DuskScheme.axaml b/src/Semi.Avalonia/Schemes/DuskScheme.axaml
index fe3d1b4..ba61cd2 100644
--- a/src/Semi.Avalonia/Schemes/DuskScheme.axaml
+++ b/src/Semi.Avalonia/Schemes/DuskScheme.axaml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/LightScheme.axaml b/src/Semi.Avalonia/Schemes/LightScheme.axaml
index 28a6714..0788b04 100644
--- a/src/Semi.Avalonia/Schemes/LightScheme.axaml
+++ b/src/Semi.Avalonia/Schemes/LightScheme.axaml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml b/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml
index a337c82..74d6e92 100644
--- a/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml
+++ b/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml
@@ -1,6 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml
index cbf8643..3b63207 100644
--- a/src/Semi.Avalonia/SemiTheme.axaml
+++ b/src/Semi.Avalonia/SemiTheme.axaml
@@ -5,22 +5,22 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Styles/_index.axaml b/src/Semi.Avalonia/Styles/_index.axaml
index 5afce03..bcc6bca 100644
--- a/src/Semi.Avalonia/Styles/_index.axaml
+++ b/src/Semi.Avalonia/Styles/_index.axaml
@@ -1,4 +1,4 @@
-
-
+
+
\ 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 b2620b9..3290cda 100644
--- a/src/Semi.Avalonia/Themes/Dark/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/_index.axaml
@@ -1,47 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/_index.axaml b/src/Semi.Avalonia/Themes/HighContrast/_index.axaml
index 0a4ac27..3290cda 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/_index.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/_index.axaml
@@ -1,47 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 6ce2972..3290cda 100644
--- a/src/Semi.Avalonia/Themes/Light/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Light/_index.axaml
@@ -1,47 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 3ff987e..3290cda 100644
--- a/src/Semi.Avalonia/Themes/Shared/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml
@@ -1,47 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml
index 00f103c..11ab37e 100644
--- a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml
+++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml
@@ -1,4 +1,7 @@
-
+
White
Black
diff --git a/src/Semi.Avalonia/Tokens/Palette/Light.axaml b/src/Semi.Avalonia/Tokens/Palette/Light.axaml
index e560278..7b4b843 100644
--- a/src/Semi.Avalonia/Tokens/Palette/Light.axaml
+++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml
@@ -1,4 +1,7 @@
-
+
White
Black