From 5d5c439cb03c501dc092bcce1933dd7c83442d93 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Sat, 31 May 2025 23:07:29 +0800 Subject: [PATCH] misc: remove unused ViewModel references from demo pages. --- demo/Ursa.Demo/Pages/BannerDemo.axaml.cs | 2 -- demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs | 2 -- demo/Ursa.Demo/Pages/DividerDemo.axaml.cs | 6 ------ .../Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml.cs | 2 -- demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs | 6 ------ demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs | 2 -- demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs | 2 -- demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs | 6 ++---- demo/Ursa.Demo/Pages/PaginationDemo.axaml.cs | 2 -- demo/Ursa.Demo/Pages/RangeSliderDemo.axaml.cs | 2 -- demo/Ursa.Demo/Pages/RatingDemo.axaml.cs | 2 -- demo/Ursa.Demo/Pages/SkeletonDemo.axaml.cs | 15 ++++++--------- demo/Ursa.Demo/Pages/TimelineDemo.axaml.cs | 2 -- 13 files changed, 8 insertions(+), 43 deletions(-) diff --git a/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs b/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs index 421a235..09fe469 100644 --- a/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/BannerDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class BannerDemo : UserControl public BannerDemo() { InitializeComponent(); - this.DataContext = new BannerDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs b/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs index 5b00129..f2f9043 100644 --- a/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class ButtonGroupDemo : UserControl public ButtonGroupDemo() { InitializeComponent(); - DataContext = new ButtonGroupDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs b/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs index 9f3018a..49b618e 100644 --- a/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/DividerDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; @@ -9,9 +8,4 @@ public partial class DividerDemo : UserControl { InitializeComponent(); } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml.cs b/demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml.cs index f405240..201a966 100644 --- a/demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class ElasticWrapPanelDemo : UserControl public ElasticWrapPanelDemo() { InitializeComponent(); - DataContext = new ElasticWrapPanelDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs b/demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs index 65a17f2..d55b157 100644 --- a/demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Avalonia.Markup.Xaml; namespace Ursa.Demo.Pages; @@ -9,9 +8,4 @@ public partial class LoadingDemo : UserControl { InitializeComponent(); } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs b/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs index cfdc4c9..67c7931 100644 --- a/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class MessageBoxDemo : UserControl public MessageBoxDemo() { InitializeComponent(); - this.DataContext = new MessageBoxDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs b/demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs index d1bae7d..6e78ad8 100644 --- a/demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class NavMenuDemo : UserControl public NavMenuDemo() { InitializeComponent(); - DataContext = new NavMenuDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs index 40e00de..3112407 100644 --- a/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs @@ -1,7 +1,6 @@ -using Avalonia.Controls; -using System.Diagnostics; +using System.Diagnostics; +using Avalonia.Controls; using Ursa.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -10,7 +9,6 @@ public partial class NumericUpDownDemo : UserControl public NumericUpDownDemo() { InitializeComponent(); - DataContext = new NumericUpDownDemoViewModel(); numd.ValueChanged += Numd_ValueChanged; } diff --git a/demo/Ursa.Demo/Pages/PaginationDemo.axaml.cs b/demo/Ursa.Demo/Pages/PaginationDemo.axaml.cs index 0377132..2f87c76 100644 --- a/demo/Ursa.Demo/Pages/PaginationDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/PaginationDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class PaginationDemo : UserControl public PaginationDemo() { InitializeComponent(); - this.DataContext = new PaginationDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/RangeSliderDemo.axaml.cs b/demo/Ursa.Demo/Pages/RangeSliderDemo.axaml.cs index 920b149..6d8fa2e 100644 --- a/demo/Ursa.Demo/Pages/RangeSliderDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/RangeSliderDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class RangeSliderDemo : UserControl public RangeSliderDemo() { InitializeComponent(); - this.DataContext = new RangeSliderDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/RatingDemo.axaml.cs b/demo/Ursa.Demo/Pages/RatingDemo.axaml.cs index 8168903..79ef7a7 100644 --- a/demo/Ursa.Demo/Pages/RatingDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/RatingDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class RatingDemo : UserControl public RatingDemo() { InitializeComponent(); - this.DataContext = new RatingDemoViewModel(); } } \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/SkeletonDemo.axaml.cs b/demo/Ursa.Demo/Pages/SkeletonDemo.axaml.cs index 6d92de3..d40a6a5 100644 --- a/demo/Ursa.Demo/Pages/SkeletonDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/SkeletonDemo.axaml.cs @@ -1,14 +1,11 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; -namespace Ursa.Demo.Pages +namespace Ursa.Demo.Pages; + +public partial class SkeletonDemo : UserControl { - public partial class SkeletonDemo : UserControl + public SkeletonDemo() { - public SkeletonDemo() - { - InitializeComponent(); - DataContext = new SkeletonDemoViewModel(); - } + InitializeComponent(); } -} +} \ No newline at end of file diff --git a/demo/Ursa.Demo/Pages/TimelineDemo.axaml.cs b/demo/Ursa.Demo/Pages/TimelineDemo.axaml.cs index a8f4819..11dd56e 100644 --- a/demo/Ursa.Demo/Pages/TimelineDemo.axaml.cs +++ b/demo/Ursa.Demo/Pages/TimelineDemo.axaml.cs @@ -1,5 +1,4 @@ using Avalonia.Controls; -using Ursa.Demo.ViewModels; namespace Ursa.Demo.Pages; @@ -8,6 +7,5 @@ public partial class TimelineDemo : UserControl public TimelineDemo() { InitializeComponent(); - this.DataContext = new TimelineDemoViewModel(); } } \ No newline at end of file