Merge pull request #18 from Ali-YousefiTelori/develop

add custom content page creator
EasyMicroservices · Dec 22, 2023 · 591343b · 591343b
2 parents 80a4995 + 4a44e16
commit 591343b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Navigations/NavigationManagerBase.cs b/src/CSharp/Cores/EasyMicroservices.UI.Cores.Mvvm/Navigations/NavigationManagerBase.cs
@@ -17,7 +17,7 @@ public abstract class NavigationManagerBase
     /// <summary>
     /// 
     /// </summary>
-    protected ConcurrentDictionary<string, Type> Pages { get; set; } = new ConcurrentDictionary<string, Type>();
+    protected ConcurrentDictionary<string, Func<IPage>> Pages { get; set; } = new ConcurrentDictionary<string, Func<IPage>>();
 
     /// <summary>
     /// 
@@ -76,6 +76,6 @@ public abstract class NavigationManagerBase
     public void RegisterPage<T>(string pageName)
         where T : IPage, new()
     {
-        Pages.TryAdd(pageName, typeof(T));
+        Pages.TryAdd(pageName, () => new T());
     }
 }
diff --git a/...auiComponents/EasyMicroservices.UI.MauiComponents/Navigations/DefaultNavigationManager.cs b/...auiComponents/EasyMicroservices.UI.MauiComponents/Navigations/DefaultNavigationManager.cs
@@ -1,6 +1,7 @@
 using EasyMicroservices.UI.Cores;
 using EasyMicroservices.UI.Cores.Interfaces;
 using EasyMicroservices.UI.Cores.Navigations;
+using EasyMicroservices.UI.MauiComponents.Design.Pages;
 
 namespace EasyMicroservices.UI.MauiComponents.Navigations;
 public class DefaultNavigationManager : NavigationManagerBase
@@ -23,9 +24,9 @@ public override Task<TResponseData> PushAsync<TResponseData>(string pageName, bo
 
     public override async Task<TResponseData> PushDataAsync<TData, TResponseData>(TData data, string pageName, bool doClear = false)
     {
-        if (!Pages.TryGetValue(pageName, out Type pageTpe))
+        if (!Pages.TryGetValue(pageName, out Func<IPage> pageCreator))
             throw new Exception($"Page {pageName} not found, did you register it?");
-        var findPage = Activator.CreateInstance(pageTpe);
+        var findPage = pageCreator();
         ContentPage page = findPage as ContentPage;
         if (page == null)
             throw new NotImplementedException($"Page {pageName} is not inherit Page!");
@@ -86,4 +87,20 @@ public override Task<bool> OpenBrowser(string url)
     {
         return Browser.OpenAsync(url, BrowserLaunchMode.SystemPreferred);
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="pageName"></param>
+    public void RegisterContentPage<TView>(string pageName)
+        where TView : ContentView, new()
+    {
+        Pages.TryAdd(pageName, () =>
+        {
+            return new EasyContentPage()
+            {
+                Content = new TView()
+            };
+        });
+    }
 }