Refactor | Page Routing

Author: kitUIN

ShadowViewer.Plugin.Local

@@ -63,7 +63,7 @@
                     <NavigationViewItem
                         Content="{x:Bind Content, Mode=OneWay}"
                         Icon="{x:Bind Icon, Mode=OneWay}"
-                        Tag="{x:Bind}" />
+                        Tag="{x:Bind Uri, Mode=OneWay}" />
                 </DataTemplate>
             </NavigationView.MenuItemTemplate>
         </NavigationView>

ShadowViewer.Plugin.PluginManager

@@ -11,7 +11,9 @@
 using ShadowViewer.Sdk.Args;
 using ShadowViewer.Sdk.Enums;
 using ShadowViewer.Sdk.Models.Interfaces;
+using ShadowViewer.Sdk.Navigation;
 using ShadowViewer.Sdk.Services;
+using ShadowViewer.Sdk.Utils;
 using ShadowViewer.ViewModels;
 using ShadowViewer.Services;
 
@@ -25,10 +27,13 @@ public sealed partial class NavigationPage
         private INotifyService NotifyService { get; } = DiFactory.Services.Resolve<INotifyService>();
         private PluginEventService PluginEventService { get; } = DiFactory.Services.Resolve<PluginEventService>();
 
+        private INavigateService NavigateService { get; }
+
         public NavigationPage()
         {
             this.InitializeComponent();
-
+            ShadowRouteRegistry.RegisterPage(new ShadowNavigation(typeof(SettingsPage), SelectItemId: "_settings"),
+                "settings");
             DiFactory.Services.Register<INavigateService, NavigateService>(reuse: Reuse.Singleton,
                 made: Parameters.Of.Type(_ => ContentFrame));
             ViewModel.InitItems();
@@ -37,7 +42,8 @@ public NavigationPage()
             PluginEventService.PluginDisabled += CallerOnPluginEnabledEvent;
             NotifyService.TipPopupEvent += NotifyService_TipPopupEvent;
             Caller.TopLevelControlEvent += CallerTopLevelControlEvent;
-            DiFactory.Services.Resolve<INavigateService>().TrySelectItemEvent += TrySelectItemCaller;
+            NavigateService = DiFactory.Services.Resolve<INavigateService>();
+            NavigateService.TrySelectItemEvent += TrySelectItemCaller;
         }
 
         /// <summary>
@@ -50,8 +56,10 @@ private void TrySelectItemCaller(object? sender, TrySelectItemEventArgs e)
             if (e.Id == "_settings") item = NavView.SettingsItem;
             else
             {
-                item = ViewModel.MenuItems.FirstOrDefault(x => x.Id == e.Id) ?? ViewModel.FooterMenuItems.FirstOrDefault(x => x.Id == e.Id);
+                item = ViewModel.MenuItems.FirstOrDefault(x => x.Id == e.Id) ??
+                       ViewModel.FooterMenuItems.FirstOrDefault(x => x.Id == e.Id);
             }
+
             if (item == null) return;
             NavView.SelectedItem = item;
         }
@@ -106,12 +114,10 @@ private void NavView_ItemInvoked(NavigationView sender, NavigationViewItemInvoke
                 page = typeof(SettingsPage);
             }
             else if (args.InvokedItemContainer != null &&
-                     args.InvokedItemContainer.Tag is IShadowNavigationItem item &&
-                     ViewModel.NavigationViewItemInvokedHandler(item) is { } navigation)
+                     args.InvokedItemContainer.Tag is ShadowUri uri)
             {
-                parameter = navigation.Parameter;
-                page = navigation.Page;
-                info = navigation.Info;
+                NavigateService.Navigate(uri);
+                return;
             }
 
             if (page == null || ContentFrame.CurrentSourcePageType == page) return;

ShadowViewer.Sdk

@@ -1,12 +1,9 @@
 using System;
-using DryIoc;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using ShadowPluginLoader.Attributes;
-using ShadowPluginLoader.WinUI;
-using ShadowViewer.Pages;
 using ShadowViewer.Sdk.Args;
-using ShadowViewer.Sdk.Helpers;
+using ShadowViewer.Sdk.Navigation;
 using ShadowViewer.Sdk.Services;
 
 namespace ShadowViewer.Services;
@@ -32,27 +29,17 @@ public void Navigate(Type page, object? parameter = null,
         TrySelectItemEvent?.Invoke(this, new TrySelectItemEventArgs(selectItemId));
     }
 
-    public void Navigate(Uri uri)
+    public void Navigate(ShadowUri uri, NavigationTransitionInfo? info = null)
     {
         if (uri.Scheme != "shadow") return;
-        var urls = uri.AbsolutePath.Split(['/'], StringSplitOptions.RemoveEmptyEntries);
-        switch (uri.Host)
-        {
-            case "settings":
-                Navigate(typeof(SettingsPage), selectItemId: "_settings");
-                return;
-            default:
-                if (ResponderHelper.GetEnabledNavigateResponder(uri.Host) is { } responder)
-                {
-                    var res = responder.Navigate(uri, urls);
-                    if (res == null) return;
-                    Navigate(res.Page, res.Parameter, res.Info, res.Force, res.SelectItemId);
-                }
-                else
-                {
-                    DiFactory.Services.Resolve<INotifyService>().NotifyTip(this, $"shadow://{uri.Host}所属的应用不存在,请确认是否安装后重新唤起", InfoBarSeverity.Error, 4D);
-                }
-                break;
-        }
+
+        var item = ShadowRouteRegistry.ResolvePage(uri);
+        if (item == null) return;
+        Navigate(item.Page, item.Parameter ?? uri, item.Info ?? info, item.Force, item.SelectItemId);
+    }
+
+    public void Navigate(Uri uri, NavigationTransitionInfo? info  = null)
+    {
+        Navigate(ShadowUri.Parse(uri), info);
     }
 }

ShadowViewer/Pages/NavigationPage.xaml

@@ -6,7 +6,6 @@
 using ShadowViewer.Sdk.Models.Interfaces;
 using ShadowViewer.Sdk;
 using ShadowViewer.Sdk.Helpers;
-using ShadowViewer.Sdk.Utils;
 
 namespace ShadowViewer.ViewModels;
 
@@ -30,12 +29,7 @@ public NavigationViewModel(PluginLoader pluginService)
     /// 导航栏底部菜单
     /// </summary>
     public readonly ObservableCollection<IShadowNavigationItem> FooterMenuItems = [];
-
-    public ShadowNavigation? NavigationViewItemInvokedHandler(IShadowNavigationItem item)
-    {
-        var responder = ResponderHelper.GetEnabledResponder<INavigationResponder>(item.PluginId);
-        return responder?.NavigationViewItemInvokedHandler(item);
-    }
+    
 
     /// <summary>
     /// 添加导航栏个体