Add non-generic WarmUp

Geeksltd · Sep 11, 2024 · 923318c · 923318c
1 parent 83dbcde
commit 923318c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/Core/Navigation/Nav.cs b/Core/Navigation/Nav.cs
@@ -471,15 +471,28 @@ public static async Task WarmUp<TPage>() where TPage : Page
 
             var page = GetOrCreateTargetPage(typeof(TPage)).Item1;
 
-            if (CacheViewAttribute.IsCacheable(page))
+            await WarmUp(page);
+        }
+
+        /// <summary>
+        /// Warmp-up cachable target page to enable to navigate faster.
+        /// </summary>
+        public static async Task WarmUp(Page page)
+        {
+            if (CacheViewAttribute.IsCacheable(page) == false)
             {
-                CachedPages.Add(page);
-                await View.Root.Add(page.X(View.Root.ActualWidth).Y(0));
+                Log.For<Nav>().Error("The WarmUp navigation just work on cachable pages, please make sure the target page has the CacheViewAttribute");
+                return;
             }
-            else
+
+            if (CachedPages.Contains(page))
             {
-                Log.For<Nav>().Error("The WarmUp navigation just work on cachable pages, please make sure the target page has the CacheViewAttribute");
+                Log.For<Nav>().Info($"{page.GetType()} is already cached.");
+                return;
             }
+
+            CachedPages.Add(page);
+            await View.Root.Add(page.X(View.Root.ActualWidth).Y(0));
         }
 
         static IDictionary<string, object> SerializeToDictionary(object navParams)

diff --git a/Core/ViewModel/Templates.cs b/Core/ViewModel/Templates.cs
@@ -5,7 +5,7 @@ namespace Zebble.Mvvm
 {
     partial class Templates
     {
-        internal static View GetOrCreate(ViewModel target)
+        public static View GetOrCreate(ViewModel target)
         {
             var template = Mappings.GetOrDefault(target.GetType());
 

diff --git a/Zebble/Zebble.csproj b/Zebble/Zebble.csproj
@@ -7,7 +7,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>5.0.60.0</Version>
+    <Version>5.0.61.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <NoWarn>0618;0162</NoWarn>