avaloniaui namespace adjust

Author: NeverMorewd

src/Lemon.ModuleNavigation.Avaloniaui/DialogService.cs

@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 using Lemon.ModuleNavigation.Abstractions;
-using Lemon.ModuleNavigation.Dialogs;
+using Lemon.ModuleNavigation.Core;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Lemon.ModuleNavigation.Avaloniaui;

src/Lemon.ModuleNavigation.Sample/ModuleAs/ViewModelA.cs

@@ -5,7 +5,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleAs;
 
-public class ViewModelA : SampleViewModelBase, IModuleNavigationAware
+public class ViewModelA : BaseNavigationViewModel, IModuleNavigationAware
 {
     private readonly NavigationService _navigationService;
     public ViewModelA(NavigationService navigationService)

src/Lemon.ModuleNavigation.Sample/ModuleBs/ViewModelB.cs

@@ -5,7 +5,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleBs;
 
-public class ViewModelB : SampleViewModelBase, IModuleNavigationAware
+public class ViewModelB : BaseNavigationViewModel, IModuleNavigationAware
 {
     private readonly NavigationService _navigationService;
     public ViewModelB(NavigationService navigationService)

src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModelC.cs

@@ -6,7 +6,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleCs
 {
-    public class ViewModelC : SampleViewModelBase, IModuleNavigationAware, IServiceAware
+    public class ViewModelC : BaseNavigationViewModel, IModuleNavigationAware, IServiceAware
     {
         private readonly IModuleNavigationService<IModule> _navigationService;
         private readonly IServiceProvider _moduleServiceProvider;

src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel01.cs

@@ -6,7 +6,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleCs.ViewModels;
 
-public class SubViewModel01 : SampleViewModelBase, IModuleNavigationAware
+public class SubViewModel01 : BaseNavigationViewModel, IModuleNavigationAware
 {
     private readonly ILogger _logger;
     public SubViewModel01(IServiceProvider serviceProvider, IServiceProviderDecorator appServiceProvider)

src/Lemon.ModuleNavigation.Sample/ModuleCs/ViewModels/SubViewModel02.cs

@@ -4,7 +4,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ModuleCs.ViewModels;
 
-public class SubViewModel02 : SampleViewModelBase, IModuleNavigationAware
+public class SubViewModel02 : BaseNavigationViewModel, IModuleNavigationAware
 {
     public SubViewModel02(IServiceProvider serviceProvider)
     {

src/Lemon.ModuleNavigation.Sample/ViewModels/MainViewModel.cs

@@ -11,7 +11,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels;
 
-public class MainViewModel : SampleViewModelBase, IServiceAware
+public class MainViewModel : BaseNavigationViewModel, IServiceAware
 {
     private readonly NavigationService _navigationService;
     private readonly IServiceProvider _serviceProvider;

src/Lemon.ModuleNavigation.Sample/ViewModels/SampleViewModelBase.cs

@@ -1,13 +1,32 @@
-using ReactiveUI;
+using Lemon.ModuleNavigation.Abstractions;
+using ReactiveUI;
 using System;
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels;
 
-public class SampleViewModelBase : ReactiveObject, IDisposable
+public class BaseNavigationViewModel : ReactiveObject, INavigationAware, IDisposable
 {
     public virtual string Greeting => $"Welcome to {GetType().Name}[{Environment.ProcessId}][{Environment.CurrentManagedThreadId}]{Environment.NewLine}{DateTime.Now:yyyy-MM-dd HH-mm-ss.ffff}";
+
+    public event Action? RequestUnload;
+
     public virtual void Dispose()
     {
 
     }
+
+    public virtual bool IsNavigationTarget(NavigationContext navigationContext)
+    {
+        return !navigationContext.RequestNew;
+    }
+
+    public virtual void OnNavigatedFrom(NavigationContext navigationContext)
+    {
+       
+    }
+
+    public virtual void OnNavigatedTo(NavigationContext navigationContext)
+    {
+        
+    }
 }

src/Lemon.ModuleNavigation.Sample/ViewModels/ViewAlphaViewModel.cs

@@ -7,9 +7,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels
 {
-    public class ViewAlphaViewModel : SampleViewModelBase, 
-        IDialogAware, 
-        INavigationAware
+    public class ViewAlphaViewModel : BaseNavigationViewModel, IDialogAware
     {
         private readonly ILogger _logger;
         public ViewAlphaViewModel(ILogger<ViewAlphaViewModel> logger)

src/Lemon.ModuleNavigation.Sample/ViewModels/ViewBetaViewModel.cs

@@ -7,9 +7,7 @@
 
 namespace Lemon.ModuleNavigation.Sample.ViewModels;
 
-public class ViewBetaViewModel : SampleViewModelBase,
-    IDialogAware,
-    INavigationAware
+public class ViewBetaViewModel : BaseNavigationViewModel, IDialogAware
 {
     private readonly ILogger _logger;
     public ViewBetaViewModel(ILogger<ViewBetaViewModel> logger)