rename

Author: NeverMorewd

src/Lemon.ModuleNavigation.Avaloniaui/Regions/Region.cs

@@ -1,6 +1,5 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Avalonia.Markup.Xaml.Templates;
 using Lemon.ModuleNavigation.Abstractions;
 using Lemon.ModuleNavigation.Core;
 using Microsoft.Extensions.DependencyInjection;

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

@@ -104,7 +104,7 @@ await _dialogService.ShowDialog(content,
 
         UnloadViewCommand = ReactiveCommand.Create<NavigationContext>((context) =>
         {
-            _regionManager.RequestUnload(context);
+            _regionManager.RequestViewUnload(context);
         });
 
         _regionManager.NavigationSubscribe<NavigationContext>(n => 

src/Lemon.ModuleNavigation.WpfSample/MainWindowViewModel.cs

@@ -82,7 +82,7 @@ await _dialogService.ShowDialog(content,
         });
         UnloadViewCommand = ReactiveCommand.Create<NavigationContext>((context) =>
         {
-            _regionManager.RequestUnload(context);
+            _regionManager.RequestViewUnload(context);
         });
     }
 

src/Lemon.ModuleNavigation/Abstractions/IRegionManager.cs

@@ -2,13 +2,20 @@
 
 namespace Lemon.ModuleNavigation.Abstractions;
 
-public interface IRegionManager: IObservable<NavigationContext>, IObservable<IRegion>
+public interface IRegionManager : IObservable<NavigationContext>, IObservable<IRegion>
 {
     void AddRegion(string regionName, IRegion region);
     IRegion? GetRegion(string regionName);
-    void RequestNavigate(string regionName, string viewName, NavigationParameters? parameters = null);
+
+    void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null);
     [Obsolete("requestNew was obsolete.Consider IsNavigationTarget() in INavigationAware instead.")]
     void RequestNavigate(string regionName, string viewName, bool requestNew, NavigationParameters? parameters = null);
-    void RequestUnload(string regionName, string viewName);
-    void RequestUnload(NavigationContext context);
+    void RequestViewUnload(string regionName, string viewName);
+    void RequestViewUnload(NavigationContext context);
+
+
+    void RequestModuleNavigate(string regionName, string moduleName, NavigationParameters? parameters);
+    void RequestModuleNavigate(string regionName, IModule module, NavigationParameters? parameters);
+    void RequestModuleUnload(string moduleName, string viewName);
+    void RequestModuleUnload(IModule module);
 }

src/Lemon.ModuleNavigation/ModuleManager.cs

@@ -23,7 +23,7 @@ public ModuleManager(IEnumerable<IModule> modules,
         _regionCache = [];
         _modulesCache = new ConcurrentDictionary<string, IModule>(modules.ToDictionary(m => m.Key, m => m));
         Modules = _modulesCache.Values;
-        ActiveModules = new ObservableCollection<IModule>(_modulesCache
+        ActiveModules = [.. _modulesCache
         .Where(m =>
         {
             return !m.Value.LoadOnDemand;
@@ -32,7 +32,7 @@ public ModuleManager(IEnumerable<IModule> modules,
         {
             m.Value.Initialize();
             return m.Value;
-        }));
+        })];
     }
     public ObservableCollection<IModule> ActiveModules 
     { 

src/Lemon.ModuleNavigation/NavigationHandler.cs

@@ -35,18 +35,18 @@ public void OnNavigateTo(string moduleKey, NavigationParameters? parameters)
     public void OnNavigateTo(string regionName,
          string viewName)
     {
-        RegionManager.RequestNavigate(regionName, viewName, null);
+        RegionManager.RequestViewNavigate(regionName, viewName, null);
     }
     public void OnNavigateTo(string regionName,
         string viewName,
         NavigationParameters navigationParameters)
     {
-        RegionManager.RequestNavigate(regionName, viewName, navigationParameters);
+        RegionManager.RequestViewNavigate(regionName, viewName, navigationParameters);
     }
 
     public void OnViewUnload(string regionName, string viewName)
     {
-        RegionManager.RequestUnload(regionName, viewName);
+        RegionManager.RequestViewUnload(regionName, viewName);
     }
 
     void IDisposable.Dispose()

src/Lemon.ModuleNavigation/RegionManager.cs

@@ -41,7 +41,7 @@ public void RequestNavigate(string regionName, string viewName, bool requestNew,
                 });
         }
     }
-    public void RequestNavigate(string regionName, string viewName, NavigationParameters? parameters = null)
+    public void RequestViewNavigate(string regionName, string viewName, NavigationParameters? parameters = null)
     {
         var context = new NavigationContext(viewName, regionName, _serviceProvider, parameters);
         if (_regions.TryGetValue(regionName, out var region))
@@ -93,7 +93,7 @@ public void AddRegion(string regionName, IRegion region)
         return region;
     }
 
-    public void RequestUnload(string regionName, string viewName)
+    public void RequestViewUnload(string regionName, string viewName)
     {
         if (_regions.TryGetValue(regionName, out var region))
         {
@@ -104,7 +104,7 @@ public void RequestUnload(string regionName, string viewName)
             throw new RegionNameNotFoundException(nameof(regionName));
         }
     }
-    public void RequestUnload(NavigationContext navigationContext)
+    public void RequestViewUnload(NavigationContext navigationContext)
     {
         if (_regions.TryGetValue(navigationContext.RegionName, out var region))
         {
@@ -165,4 +165,23 @@ private void ToRegionsObservers(IRegion region)
         }
     }
 
+    public void RequestModuleNavigate(string regionName, string moduleName, NavigationParameters? parameters)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void RequestModuleNavigate(string regionName, IModule module, NavigationParameters? parameters)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void RequestModuleUnload(string moduleName, string viewName)
+    {
+        throw new NotImplementedException();
+    }
+
+    public void RequestModuleUnload(IModule module)
+    {
+        throw new NotImplementedException();
+    }
 }