chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #688 from irihitech/demo

Browse Source 
Remove Unused ViewModel References from Demo Pages
This commit is contained in:
Dong Bin
2025-06-07 21:51:10 +08:00
committed by GitHub
parent 7805e04af4 447629170b
commit b7da53f5f0
16 changed files with 20 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Ursa.Demo/Pages/BannerDemo.axaml.cs
View File

@@ -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();
}
}

2
demo/Ursa.Demo/Pages/ButtonGroupDemo.axaml.cs
View File

@@ -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();
}
}

6
demo/Ursa.Demo/Pages/DividerDemo.axaml.cs
View File

@@ -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);
}
}

2
demo/Ursa.Demo/Pages/ElasticWrapPanelDemo.axaml.cs
View File

@@ -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();
}
}

6
demo/Ursa.Demo/Pages/LoadingDemo.axaml.cs
View File

@@ -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);
}
}

2
demo/Ursa.Demo/Pages/MessageBoxDemo.axaml.cs
View File

@@ -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();
}
}

2
demo/Ursa.Demo/Pages/NavMenuDemo.axaml.cs
View File

@@ -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();
}
}

9
demo/Ursa.Demo/Pages/NotificationDemo.axaml.cs
View File

@@ -7,22 +7,17 @@ namespace Ursa.Demo.Pages;
public partial class NotificationDemo : UserControl
{
private NotificationDemoViewModel _viewModel;
public NotificationDemo()
{
InitializeComponent();
_viewModel = new NotificationDemoViewModel();
DataContext = _viewModel;
}
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
if (DataContext is not NotificationDemoViewModel vm) return;
var topLevel = TopLevel.GetTopLevel(this);
if (topLevel is null)
return;
_viewModel.NotificationManager = WindowNotificationManager.TryGetNotificationManager(topLevel, out var manager)
vm.NotificationManager = WindowNotificationManager.TryGetNotificationManager(topLevel, out var manager)
? manager
: new WindowNotificationManager(topLevel);
}

6
demo/Ursa.Demo/Pages/NumericUpDownDemo.axaml.cs
View File

@@ -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;
}

2
demo/Ursa.Demo/Pages/PaginationDemo.axaml.cs
View File

@@ -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();
}
}

11
demo/Ursa.Demo/Pages/PopConfirmDemo.axaml.cs
View File

@@ -1,6 +1,5 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Ursa.Controls;
using Ursa.Demo.ViewModels;
@@ -16,10 +15,10 @@ public partial class PopConfirmDemo : UserControl
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
if (this.DataContext is not PopConfirmDemoViewModel vm) return;
var manager = WindowToastManager.TryGetToastManager(TopLevel.GetTopLevel(this), out var m)
? m
: new WindowToastManager(TopLevel.GetTopLevel(this));
vm.ToastManager = manager;
if (DataContext is not PopConfirmDemoViewModel vm) return;
var topLevel = TopLevel.GetTopLevel(this);
vm.ToastManager = WindowToastManager.TryGetToastManager(topLevel, out var manager)
? manager
: new WindowToastManager(topLevel);
}
}

2
demo/Ursa.Demo/Pages/RangeSliderDemo.axaml.cs
View File

@@ -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();
}
}

2
demo/Ursa.Demo/Pages/RatingDemo.axaml.cs
View File

@@ -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();
}
}

7
demo/Ursa.Demo/Pages/SkeletonDemo.axaml.cs
View File

@@ -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 SkeletonDemo()
{
InitializeComponent();
DataContext = new SkeletonDemoViewModel();
}
}
}

2
demo/Ursa.Demo/Pages/TimelineDemo.axaml.cs
View File

@@ -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();
}
}

11
demo/Ursa.Demo/Pages/ToastDemo.axaml.cs
View File

@@ -7,25 +7,24 @@ namespace Ursa.Demo.Pages;
public partial class ToastDemo : UserControl
{
private ToastDemoViewModel _viewModel;
private ToastDemoViewModel? _viewModel;
public ToastDemo()
{
InitializeComponent();
_viewModel = new ToastDemoViewModel();
DataContext = _viewModel;
}
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
var topLevel = TopLevel.GetTopLevel(this);
_viewModel.ToastManager = new WindowToastManager(topLevel) { MaxItems = 3 };
if (DataContext is not ToastDemoViewModel vm) return;
_viewModel = vm;
_viewModel.ToastManager = new WindowToastManager(TopLevel.GetTopLevel(this)) { MaxItems = 3 };
}
protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnDetachedFromVisualTree(e);
_viewModel.ToastManager?.Uninstall();
_viewModel?.ToastManager?.Uninstall();
}
}