From 4e793691d20862025b5551b2b873e33f501a4137 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Mon, 26 Feb 2024 01:33:58 +0800
Subject: [PATCH] feat: fix various issues.

---
 demo/Ursa.Demo/Pages/SkeletonDemo.axaml        |  8 ++++----
 demo/Ursa.Demo/ViewModels/MainViewViewModel.cs |  1 -
 demo/Ursa.Demo/ViewModels/MenuViewModel.cs     |  2 +-
 src/Ursa.Themes.Semi/Controls/Skeleton.axaml   |  8 ++++----
 src/Ursa.Themes.Semi/Styles/Skeleton.axaml     |  2 +-
 src/Ursa/Controls/Skeleton.cs                  | 10 +++++-----
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/demo/Ursa.Demo/Pages/SkeletonDemo.axaml b/demo/Ursa.Demo/Pages/SkeletonDemo.axaml
index 3699bdf..2f1ce91 100644
--- a/demo/Ursa.Demo/Pages/SkeletonDemo.axaml
+++ b/demo/Ursa.Demo/Pages/SkeletonDemo.axaml
@@ -25,7 +25,7 @@
                 VerticalAlignment="Center"
                 CornerRadius="2"
                 IsActive="{Binding #active.IsChecked}"
-                Loading="{Binding #loading.IsChecked}">
+                IsLoading="{Binding #loading.IsChecked}">
                 <Image RenderOptions.BitmapInterpolationMode="HighQuality" Source="../Assets/Ursa.ico" />
             </u:Skeleton>
             <UniformGrid
@@ -38,7 +38,7 @@
                     VerticalAlignment="Top"
                     CornerRadius="2"
                     IsActive="{Binding #active.IsChecked}"
-                    Loading="{Binding #loading.IsChecked}">
+                    IsLoading="{Binding #loading.IsChecked}">
                     <SelectableTextBlock Margin="0,2" Text="是先有鸡还是先有蛋" />
                 </u:Skeleton>
                 <u:Skeleton
@@ -46,14 +46,14 @@
                     VerticalAlignment="Center"
                     CornerRadius="2"
                     IsActive="{Binding #active.IsChecked}"
-                    Loading="{Binding #loading.IsChecked}">
+                    IsLoading="{Binding #loading.IsChecked}">
                     <SelectableTextBlock Margin="0,2" Text="什么是工匠精神" />
                 </u:Skeleton>
                 <u:Skeleton
                     VerticalAlignment="Bottom"
                     CornerRadius="2"
                     IsActive="{Binding #active.IsChecked}"
-                    Loading="{Binding #loading.IsChecked}">
+                    IsLoading="{Binding #loading.IsChecked}">
                     <SelectableTextBlock Margin="0,2" Text="看山不是山，看水不是水，看山还是山，看水还是水" />
                 </u:Skeleton>
             </UniformGrid>
diff --git a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
index 24d8d6e..8cc13e6 100644
--- a/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
@@ -51,7 +51,6 @@ public class MainViewViewModel : ViewModelBase
             MenuKeys.MenuKeySkeleton => new SkeletonDemoViewModel(),
             MenuKeys.MenuKeyTagInput => new TagInputDemoViewModel(),
             MenuKeys.MenuKeyTimeline => new TimelineDemoViewModel(),
-            MenuKeys.MenuKeySkeleton => new SkeletonDemoViewModel(),
             MenuKeys.MenuKeyTwoTonePathIcon => new TwoTonePathIconDemoViewModel(),
             MenuKeys.MenuKeyThemeToggler => new ThemeTogglerDemoViewModel(),
             MenuKeys.MenuKeyToolBar => new ToolBarDemoViewModel(),
diff --git a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
index d50fa6f..f3fd2e7 100644
--- a/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/MenuViewModel.cs
@@ -35,7 +35,7 @@ public class MenuViewModel: ViewModelBase
             new() { MenuHeader = "Pagination", Key = MenuKeys.MenuKeyPagination },
             new() { MenuHeader = "RangeSlider", Key = MenuKeys.MenuKeyRangeSlider },
             new() { MenuHeader = "Selection List", Key = MenuKeys.MenuKeySelectionList, Status = "New" },
-            new() { MenuHeader = "Skeleton", Key = MenuKeys.MenuKeySkeleton },
+            new() { MenuHeader = "Skeleton", Key = MenuKeys.MenuKeySkeleton, Status = "New" },
             new() { MenuHeader = "TagInput", Key = MenuKeys.MenuKeyTagInput },
             new() { MenuHeader = "Theme Toggler", Key = MenuKeys.MenuKeyThemeToggler, Status = "New" },
             new() { MenuHeader = "Timeline", Key = MenuKeys.MenuKeyTimeline, Status = "WIP" },
diff --git a/src/Ursa.Themes.Semi/Controls/Skeleton.axaml b/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
index a60ee83..47d273b 100644
--- a/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Skeleton.axaml
@@ -27,14 +27,14 @@
                         <Border
                             x:Name="PART_LoadingBorder"
                             Classes.Active="{Binding Path= IsActive, RelativeSource={RelativeSource TemplatedParent}}"
-                            IsHitTestVisible="{TemplateBinding Loading}"
+                            IsHitTestVisible="{TemplateBinding IsLoading}"
                             Background="{DynamicResource SkeletonDefaultBackground}"
-                            IsVisible="{TemplateBinding Loading}">
+                            IsVisible="{TemplateBinding IsLoading}">
                         </Border>
                         <Border
                             x:Name="PART_ActiveBorder"
-                            IsHitTestVisible="{TemplateBinding Loading}"
-                            IsVisible="{TemplateBinding Loading}"
+                            IsHitTestVisible="{TemplateBinding IsLoading}"
+                            IsVisible="{TemplateBinding IsLoading}"
                             >
                         </Border>
                     </Panel>
diff --git a/src/Ursa.Themes.Semi/Styles/Skeleton.axaml b/src/Ursa.Themes.Semi/Styles/Skeleton.axaml
index daedf0d..4ee776d 100644
--- a/src/Ursa.Themes.Semi/Styles/Skeleton.axaml
+++ b/src/Ursa.Themes.Semi/Styles/Skeleton.axaml
@@ -8,7 +8,7 @@
     </Design.PreviewWith>
 
     <!-- Add Styles Here -->
-    <Style Selector="u|Skeleton[IsActive=True][Loading=True] /template/ Border#PART_ActiveBorder">
+    <Style Selector="u|Skeleton[IsActive=True][IsLoading=True] /template/ Border#PART_ActiveBorder">
         <Style.Animations>
             <Animation
                 FillMode="None"
diff --git a/src/Ursa/Controls/Skeleton.cs b/src/Ursa/Controls/Skeleton.cs
index 6d9197f..78ede92 100644
--- a/src/Ursa/Controls/Skeleton.cs
+++ b/src/Ursa/Controls/Skeleton.cs
@@ -17,13 +17,13 @@ namespace Ursa.Controls
             set { SetValue(IsActiveProperty, value); }
         }
 
-        public static readonly StyledProperty<bool> LoadingProperty = 
-            AvaloniaProperty.Register<Skeleton, bool>(nameof(Loading));
+        public static readonly StyledProperty<bool> IsLoadingProperty = 
+            AvaloniaProperty.Register<Skeleton, bool>(nameof(IsLoading));
 
-        public bool Loading
+        public bool IsLoading
         {
-            get => GetValue(LoadingProperty);
-            set => SetValue(LoadingProperty, value);
+            get => GetValue(IsLoadingProperty);
+            set => SetValue(IsLoadingProperty, value);
         }
     }
 }