From 21b7b5e1dd1f12b8e539ce8b299345f79cdb10bd Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Sun, 17 Mar 2024 17:10:44 +0100
Subject: [PATCH 1/3] Prepare for multi-library

---
 Directory.Build.props                         |  1 +
 Nalu.sln                                      | 14 ++++
 Samples/Directory.Build.props                 |  1 +
 Samples/Nalu.Maui.DefaultShellSample/App.xaml |  1 -
 .../Nalu.Maui.DefaultShellSample.csproj       |  2 -
 Samples/Nalu.Maui.Sample/AppShell.xaml        |  2 +-
 Samples/Nalu.Maui.Sample/AppShell.xaml.cs     |  3 +-
 .../Nalu.Maui.Sample/Nalu.Maui.Sample.csproj  |  2 -
 Samples/Nalu.Maui.Sample/Pages/TwoPage.xaml   |  2 +-
 .../Internals/NaluElementHandlerExtensions.cs |  0
 Source/Nalu.Maui.Core/Nalu.Maui.Core.csproj   | 46 +++++++++++++
 .../Platforms/Android/.gitkeep                |  0
 .../Platforms/MacCatalyst/.gitkeep            |  0
 .../Platforms/Windows/.gitkeep                |  0
 .../Platforms/iOS/.gitkeep                    |  0
 .../NaluMauiAppBuilderExtensions.cs           |  0
 .../NaluMauiNavigationExtensions.cs           |  0
 .../nalu_navigation_arrow_back_android.svg    |  0
 .../Images/nalu_navigation_arrow_back_ios.svg |  0
 .../Images/nalu_navigation_menu.svg           |  0
 .../Interfaces}/IAppearingAware.cs            |  0
 .../Interfaces}/IDisappearingAware.cs         |  0
 .../Interfaces}/IEnteringAware.cs             |  0
 .../Interfaces}/ILeavingAware.cs              |  0
 .../Interfaces}/ILeavingGuard.cs              |  0
 .../Interfaces}/INaluShell.cs                 |  0
 .../Interfaces}/INavigationConfiguration.cs   |  0
 .../Interfaces}/INavigationService.cs         |  0
 .../Interfaces}/INavigationServiceProvider.cs |  0
 .../INavigationServiceProviderInternal.cs     |  0
 .../Internals}/FixedRouteFactory.cs           |  0
 .../Internals}/LeakDetector.cs                |  0
 .../Internals}/NavigationHelper.cs            |  0
 .../Internals}/NavigationService.cs           |  0
 .../Internals}/NavigationServiceProvider.cs   |  0
 .../Internals}/NavigationStackPage.cs         |  0
 .../Internals}/PageNavigationContext.cs       |  0
 .../Nalu.Maui.Navigation.csproj               | 64 +++++++++++++++++++
 .../Nalu.Maui.Navigation.csproj.DotSettings   |  6 ++
 .../Nalu.Maui.Navigation.targets}             |  0
 .../Nalu.Maui.csproj.DotSettings              |  0
 .../NaluShell.cs                              |  0
 .../NavigateCommand.cs                        |  0
 .../NavigationBehavior.cs                     |  0
 .../NavigationConfigurator.cs                 |  0
 .../NavigationInfo/AbsoluteNavigation.cs      |  0
 .../NavigationInfo/INavigationInfo.cs         |  0
 .../NavigationInfo/INavigationSegment.cs      |  0
 .../NavigationInfo/Navigation.cs              |  0
 .../NavigationInfo/NavigationExtensions.cs    |  0
 .../NavigationInfo/NavigationPop.cs           |  0
 .../NavigationInfo/NavigationSegment.cs       |  0
 .../NavigationSegmentAttribute.cs             |  0
 .../NavigationInfo/RelativeNavigation.cs      |  0
 .../Platforms/Android/.gitkeep                |  0
 .../Platforms/MacCatalyst/.gitkeep            |  0
 .../Platforms/Windows/.gitkeep                |  0
 .../Platforms/iOS/.gitkeep                    |  0
 .../ShellInfo/IShellContentProxy.cs           |  0
 .../ShellInfo/IShellItemProxy.cs              |  0
 .../ShellInfo/IShellProxy.cs                  |  0
 .../ShellInfo/IShellSectionProxy.cs           |  0
 .../ShellInfo/ShellContentProxy.cs            |  0
 .../ShellInfo/ShellItemProxy.cs               |  0
 .../ShellInfo/ShellProxy.cs                   |  0
 .../ShellInfo/ShellSectionProxy.cs            |  0
 Source/Nalu.Maui/Nalu.Maui.csproj             | 37 +----------
 .../Nalu.Maui/Navigation/NavigationLevel.cs   | 19 ------
 68 files changed, 137 insertions(+), 63 deletions(-)
 rename Source/{Nalu.Maui/Extensions => Nalu.Maui.Core}/Internals/NaluElementHandlerExtensions.cs (100%)
 create mode 100644 Source/Nalu.Maui.Core/Nalu.Maui.Core.csproj
 rename Source/{Nalu.Maui => Nalu.Maui.Core}/Platforms/Android/.gitkeep (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Core}/Platforms/MacCatalyst/.gitkeep (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Core}/Platforms/Windows/.gitkeep (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Core}/Platforms/iOS/.gitkeep (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Navigation}/Extensions/NaluMauiAppBuilderExtensions.cs (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Navigation}/Extensions/NaluMauiNavigationExtensions.cs (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Navigation}/Images/nalu_navigation_arrow_back_android.svg (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Navigation}/Images/nalu_navigation_arrow_back_ios.svg (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Navigation}/Images/nalu_navigation_menu.svg (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/IAppearingAware.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/IDisappearingAware.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/IEnteringAware.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/ILeavingAware.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/ILeavingGuard.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/INaluShell.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/INavigationConfiguration.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/INavigationService.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/INavigationServiceProvider.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Interfaces}/INavigationServiceProviderInternal.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Internals}/FixedRouteFactory.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Internals}/LeakDetector.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Internals}/NavigationHelper.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Internals}/NavigationService.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Internals}/NavigationServiceProvider.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Internals}/NavigationStackPage.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation/Internals}/PageNavigationContext.cs (100%)
 create mode 100644 Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.csproj
 create mode 100644 Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.csproj.DotSettings
 rename Source/{Nalu.Maui/Nalu.Maui.targets => Nalu.Maui.Navigation/Nalu.Maui.Navigation.targets} (100%)
 rename Source/{Nalu.Maui => Nalu.Maui.Navigation}/Nalu.Maui.csproj.DotSettings (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NaluShell.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigateCommand.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationBehavior.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationConfigurator.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/AbsoluteNavigation.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/INavigationInfo.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/INavigationSegment.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/Navigation.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/NavigationExtensions.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/NavigationPop.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/NavigationSegment.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/NavigationSegmentAttribute.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/NavigationInfo/RelativeNavigation.cs (100%)
 create mode 100644 Source/Nalu.Maui.Navigation/Platforms/Android/.gitkeep
 create mode 100644 Source/Nalu.Maui.Navigation/Platforms/MacCatalyst/.gitkeep
 create mode 100644 Source/Nalu.Maui.Navigation/Platforms/Windows/.gitkeep
 create mode 100644 Source/Nalu.Maui.Navigation/Platforms/iOS/.gitkeep
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/ShellInfo/IShellContentProxy.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/ShellInfo/IShellItemProxy.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/ShellInfo/IShellProxy.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/ShellInfo/IShellSectionProxy.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/ShellInfo/ShellContentProxy.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/ShellInfo/ShellItemProxy.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/ShellInfo/ShellProxy.cs (100%)
 rename Source/{Nalu.Maui/Navigation => Nalu.Maui.Navigation}/ShellInfo/ShellSectionProxy.cs (100%)
 delete mode 100644 Source/Nalu.Maui/Navigation/NavigationLevel.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index 364bc44..69de922 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,6 +7,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <MauiVersion>8.0.10</MauiVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">
diff --git a/Nalu.sln b/Nalu.sln
index 714444a..832ac43 100644
--- a/Nalu.sln
+++ b/Nalu.sln
@@ -79,6 +79,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nalu.Maui.Sample", "Samples
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nalu.Maui.DefaultShellSample", "Samples\Nalu.Maui.DefaultShellSample\Nalu.Maui.DefaultShellSample.csproj", "{D64BF572-B11E-4068-8848-70F3FF0FF2DF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nalu.Maui.Navigation", "Source\Nalu.Maui.Navigation\Nalu.Maui.Navigation.csproj", "{CEB939B1-E5A5-462A-834F-7D32D1893444}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nalu.Maui.Core", "Source\Nalu.Maui.Core\Nalu.Maui.Core.csproj", "{BD63D735-B1BF-42CC-936E-A97991F29B1D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -99,6 +103,14 @@ Global
 		{D64BF572-B11E-4068-8848-70F3FF0FF2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D64BF572-B11E-4068-8848-70F3FF0FF2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D64BF572-B11E-4068-8848-70F3FF0FF2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEB939B1-E5A5-462A-834F-7D32D1893444}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEB939B1-E5A5-462A-834F-7D32D1893444}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEB939B1-E5A5-462A-834F-7D32D1893444}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEB939B1-E5A5-462A-834F-7D32D1893444}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -112,6 +124,8 @@ Global
 		{5067A8EE-4496-4F5A-A5FB-4D66B89363E1} = {E1B24F25-B8A4-46EE-B7EB-7803DCFC543F}
 		{959B003B-842C-473F-99E5-E905642AFDAF} = {00000000-0000-0000-0000-000000000000}
 		{D64BF572-B11E-4068-8848-70F3FF0FF2DF} = {00000000-0000-0000-0000-000000000000}
+		{CEB939B1-E5A5-462A-834F-7D32D1893444} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
+		{BD63D735-B1BF-42CC-936E-A97991F29B1D} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {73F36209-F8D6-4066-8951-D97729F773CF}
diff --git a/Samples/Directory.Build.props b/Samples/Directory.Build.props
index 8446502..7cf604c 100644
--- a/Samples/Directory.Build.props
+++ b/Samples/Directory.Build.props
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <MauiVersion>8.0.10</MauiVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Package">
diff --git a/Samples/Nalu.Maui.DefaultShellSample/App.xaml b/Samples/Nalu.Maui.DefaultShellSample/App.xaml
index 465a56f..4fa1fbb 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/App.xaml
+++ b/Samples/Nalu.Maui.DefaultShellSample/App.xaml
@@ -1,7 +1,6 @@
 <?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:Nalu.Maui.DefaultShellSample"
              x:Class="Nalu.Maui.DefaultShellSample.App">
     <Application.Resources>
         <ResourceDictionary>
diff --git a/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj b/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj
index ee53547..5ff7c90 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj
+++ b/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj
@@ -13,11 +13,9 @@
 
         <OutputType Condition="$(TargetFramework) != 'net8.0'">Exe</OutputType>
         <RootNamespace>Nalu.Maui.DefaultShellSample</RootNamespace>
-        <UseMaui>true</UseMaui>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <MauiVersion>8.0.7</MauiVersion>
 
         <!-- Display name -->
         <ApplicationTitle>Nalu.Maui.DefaultShellSample</ApplicationTitle>
diff --git a/Samples/Nalu.Maui.Sample/AppShell.xaml b/Samples/Nalu.Maui.Sample/AppShell.xaml
index aad9ece..2a8fb9e 100644
--- a/Samples/Nalu.Maui.Sample/AppShell.xaml
+++ b/Samples/Nalu.Maui.Sample/AppShell.xaml
@@ -2,7 +2,7 @@
 
 <nalu:NaluShell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                xmlns:nalu="https://nalu-development.github.com/nalu"
+                xmlns:nalu="https://nalu-development.github.com/nalu/navigation"
                 xmlns:pages="clr-namespace:Nalu.Maui.Sample.Pages"
                 x:Class="Nalu.Maui.Sample.AppShell">
     <FlyoutItem Route="main"
diff --git a/Samples/Nalu.Maui.Sample/AppShell.xaml.cs b/Samples/Nalu.Maui.Sample/AppShell.xaml.cs
index 979b31a..295c08c 100644
--- a/Samples/Nalu.Maui.Sample/AppShell.xaml.cs
+++ b/Samples/Nalu.Maui.Sample/AppShell.xaml.cs
@@ -4,9 +4,8 @@ namespace Nalu.Maui.Sample;
 
 public partial class AppShell : NaluShell
 {
-    public AppShell(INavigationService navigationService) : base(navigationService, typeof(OnePage))
+    public AppShell(INavigationService navigationService) : base(navigationService, typeof(FivePage))
     {
         InitializeComponent();
     }
 }
-
diff --git a/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj b/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj
index 3ed046d..6a6175d 100644
--- a/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj
+++ b/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj
@@ -13,11 +13,9 @@
 
         <OutputType Condition="$(TargetFramework) != 'net8.0'">Exe</OutputType>
         <RootNamespace>Nalu.Maui.Sample</RootNamespace>
-        <UseMaui>true</UseMaui>
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <MauiVersion>8.0.7</MauiVersion>
 
         <!-- Display name -->
         <ApplicationTitle>Nalu.Maui.Sample</ApplicationTitle>
diff --git a/Samples/Nalu.Maui.Sample/Pages/TwoPage.xaml b/Samples/Nalu.Maui.Sample/Pages/TwoPage.xaml
index b27c2a4..46e5d27 100644
--- a/Samples/Nalu.Maui.Sample/Pages/TwoPage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/TwoPage.xaml
@@ -3,7 +3,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
+             xmlns:nalu="https://nalu-development.github.com/nalu/navigation"
              xmlns:pages="clr-namespace:Nalu.Maui.Sample.Pages"
              x:Class="Nalu.Maui.Sample.Pages.TwoPage"
              x:DataType="pageModels:TwoPageModel"
diff --git a/Source/Nalu.Maui/Extensions/Internals/NaluElementHandlerExtensions.cs b/Source/Nalu.Maui.Core/Internals/NaluElementHandlerExtensions.cs
similarity index 100%
rename from Source/Nalu.Maui/Extensions/Internals/NaluElementHandlerExtensions.cs
rename to Source/Nalu.Maui.Core/Internals/NaluElementHandlerExtensions.cs
diff --git a/Source/Nalu.Maui.Core/Nalu.Maui.Core.csproj b/Source/Nalu.Maui.Core/Nalu.Maui.Core.csproj
new file mode 100644
index 0000000..e629764
--- /dev/null
+++ b/Source/Nalu.Maui.Core/Nalu.Maui.Core.csproj
@@ -0,0 +1,46 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Package">
+    <Product>Nalu.Maui.Core</Product>
+    <Description>.NET MAUI developer utilities</Description>
+    <PackageTags>MAUI</PackageTags>
+    <RootNamespace>Nalu</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Build">
+    <TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+
+    <SingleProject>true</SingleProject>
+    <OutputType>Library</OutputType>
+
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <!-- <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> -->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Nalu.Maui.Test</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.Maui.Controls.XmlnsDefinition">
+      <_Parameter1>https://nalu-development.github.com/nalu/core</_Parameter1>
+      <_Parameter2>$(RootNamespace)</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+   <ItemGroup>
+      <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Platforms\Android\" />
+    <Folder Include="Platforms\iOS\" />
+    <Folder Include="Platforms\MacCatalyst\" />
+  </ItemGroup>
+</Project>
diff --git a/Source/Nalu.Maui/Platforms/Android/.gitkeep b/Source/Nalu.Maui.Core/Platforms/Android/.gitkeep
similarity index 100%
rename from Source/Nalu.Maui/Platforms/Android/.gitkeep
rename to Source/Nalu.Maui.Core/Platforms/Android/.gitkeep
diff --git a/Source/Nalu.Maui/Platforms/MacCatalyst/.gitkeep b/Source/Nalu.Maui.Core/Platforms/MacCatalyst/.gitkeep
similarity index 100%
rename from Source/Nalu.Maui/Platforms/MacCatalyst/.gitkeep
rename to Source/Nalu.Maui.Core/Platforms/MacCatalyst/.gitkeep
diff --git a/Source/Nalu.Maui/Platforms/Windows/.gitkeep b/Source/Nalu.Maui.Core/Platforms/Windows/.gitkeep
similarity index 100%
rename from Source/Nalu.Maui/Platforms/Windows/.gitkeep
rename to Source/Nalu.Maui.Core/Platforms/Windows/.gitkeep
diff --git a/Source/Nalu.Maui/Platforms/iOS/.gitkeep b/Source/Nalu.Maui.Core/Platforms/iOS/.gitkeep
similarity index 100%
rename from Source/Nalu.Maui/Platforms/iOS/.gitkeep
rename to Source/Nalu.Maui.Core/Platforms/iOS/.gitkeep
diff --git a/Source/Nalu.Maui/Extensions/NaluMauiAppBuilderExtensions.cs b/Source/Nalu.Maui.Navigation/Extensions/NaluMauiAppBuilderExtensions.cs
similarity index 100%
rename from Source/Nalu.Maui/Extensions/NaluMauiAppBuilderExtensions.cs
rename to Source/Nalu.Maui.Navigation/Extensions/NaluMauiAppBuilderExtensions.cs
diff --git a/Source/Nalu.Maui/Extensions/NaluMauiNavigationExtensions.cs b/Source/Nalu.Maui.Navigation/Extensions/NaluMauiNavigationExtensions.cs
similarity index 100%
rename from Source/Nalu.Maui/Extensions/NaluMauiNavigationExtensions.cs
rename to Source/Nalu.Maui.Navigation/Extensions/NaluMauiNavigationExtensions.cs
diff --git a/Source/Nalu.Maui/Images/nalu_navigation_arrow_back_android.svg b/Source/Nalu.Maui.Navigation/Images/nalu_navigation_arrow_back_android.svg
similarity index 100%
rename from Source/Nalu.Maui/Images/nalu_navigation_arrow_back_android.svg
rename to Source/Nalu.Maui.Navigation/Images/nalu_navigation_arrow_back_android.svg
diff --git a/Source/Nalu.Maui/Images/nalu_navigation_arrow_back_ios.svg b/Source/Nalu.Maui.Navigation/Images/nalu_navigation_arrow_back_ios.svg
similarity index 100%
rename from Source/Nalu.Maui/Images/nalu_navigation_arrow_back_ios.svg
rename to Source/Nalu.Maui.Navigation/Images/nalu_navigation_arrow_back_ios.svg
diff --git a/Source/Nalu.Maui/Images/nalu_navigation_menu.svg b/Source/Nalu.Maui.Navigation/Images/nalu_navigation_menu.svg
similarity index 100%
rename from Source/Nalu.Maui/Images/nalu_navigation_menu.svg
rename to Source/Nalu.Maui.Navigation/Images/nalu_navigation_menu.svg
diff --git a/Source/Nalu.Maui/Navigation/IAppearingAware.cs b/Source/Nalu.Maui.Navigation/Interfaces/IAppearingAware.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/IAppearingAware.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/IAppearingAware.cs
diff --git a/Source/Nalu.Maui/Navigation/IDisappearingAware.cs b/Source/Nalu.Maui.Navigation/Interfaces/IDisappearingAware.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/IDisappearingAware.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/IDisappearingAware.cs
diff --git a/Source/Nalu.Maui/Navigation/IEnteringAware.cs b/Source/Nalu.Maui.Navigation/Interfaces/IEnteringAware.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/IEnteringAware.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/IEnteringAware.cs
diff --git a/Source/Nalu.Maui/Navigation/ILeavingAware.cs b/Source/Nalu.Maui.Navigation/Interfaces/ILeavingAware.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ILeavingAware.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/ILeavingAware.cs
diff --git a/Source/Nalu.Maui/Navigation/ILeavingGuard.cs b/Source/Nalu.Maui.Navigation/Interfaces/ILeavingGuard.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ILeavingGuard.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/ILeavingGuard.cs
diff --git a/Source/Nalu.Maui/Navigation/INaluShell.cs b/Source/Nalu.Maui.Navigation/Interfaces/INaluShell.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/INaluShell.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/INaluShell.cs
diff --git a/Source/Nalu.Maui/Navigation/INavigationConfiguration.cs b/Source/Nalu.Maui.Navigation/Interfaces/INavigationConfiguration.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/INavigationConfiguration.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/INavigationConfiguration.cs
diff --git a/Source/Nalu.Maui/Navigation/INavigationService.cs b/Source/Nalu.Maui.Navigation/Interfaces/INavigationService.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/INavigationService.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/INavigationService.cs
diff --git a/Source/Nalu.Maui/Navigation/INavigationServiceProvider.cs b/Source/Nalu.Maui.Navigation/Interfaces/INavigationServiceProvider.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/INavigationServiceProvider.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/INavigationServiceProvider.cs
diff --git a/Source/Nalu.Maui/Navigation/INavigationServiceProviderInternal.cs b/Source/Nalu.Maui.Navigation/Interfaces/INavigationServiceProviderInternal.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/INavigationServiceProviderInternal.cs
rename to Source/Nalu.Maui.Navigation/Interfaces/INavigationServiceProviderInternal.cs
diff --git a/Source/Nalu.Maui/Navigation/FixedRouteFactory.cs b/Source/Nalu.Maui.Navigation/Internals/FixedRouteFactory.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/FixedRouteFactory.cs
rename to Source/Nalu.Maui.Navigation/Internals/FixedRouteFactory.cs
diff --git a/Source/Nalu.Maui/Navigation/LeakDetector.cs b/Source/Nalu.Maui.Navigation/Internals/LeakDetector.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/LeakDetector.cs
rename to Source/Nalu.Maui.Navigation/Internals/LeakDetector.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationHelper.cs b/Source/Nalu.Maui.Navigation/Internals/NavigationHelper.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationHelper.cs
rename to Source/Nalu.Maui.Navigation/Internals/NavigationHelper.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationService.cs b/Source/Nalu.Maui.Navigation/Internals/NavigationService.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationService.cs
rename to Source/Nalu.Maui.Navigation/Internals/NavigationService.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationServiceProvider.cs b/Source/Nalu.Maui.Navigation/Internals/NavigationServiceProvider.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationServiceProvider.cs
rename to Source/Nalu.Maui.Navigation/Internals/NavigationServiceProvider.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationStackPage.cs b/Source/Nalu.Maui.Navigation/Internals/NavigationStackPage.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationStackPage.cs
rename to Source/Nalu.Maui.Navigation/Internals/NavigationStackPage.cs
diff --git a/Source/Nalu.Maui/Navigation/PageNavigationContext.cs b/Source/Nalu.Maui.Navigation/Internals/PageNavigationContext.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/PageNavigationContext.cs
rename to Source/Nalu.Maui.Navigation/Internals/PageNavigationContext.cs
diff --git a/Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.csproj b/Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.csproj
new file mode 100644
index 0000000..4802cb5
--- /dev/null
+++ b/Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.csproj
@@ -0,0 +1,64 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup Label="Package">
+    <Product>Nalu.Maui</Product>
+    <Description>.NET MAUI developer utilities</Description>
+    <PackageTags>MAUI</PackageTags>
+    <RootNamespace>Nalu</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup Label="Build">
+    <TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+
+    <SingleProject>true</SingleProject>
+    <OutputType>Library</OutputType>
+
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <!-- <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion> -->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Nalu.Maui.Test</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.Maui.Controls.XmlnsDefinition">
+      <_Parameter1>https://nalu-development.github.com/nalu/navigation</_Parameter1>
+      <_Parameter2>$(RootNamespace)</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Nalu.Maui.Navigation.targets" Pack="True" PackagePath="buildTransitive\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <MauiImage Include="Images\nalu_navigation_arrow_back_android.svg" TintColor="#FFFFFF" />
+    <MauiImage Include="Images\nalu_navigation_arrow_back_ios.svg" TintColor="#FFFFFF" />
+    <MauiImage Include="Images\nalu_navigation_menu.svg" TintColor="#FFFFFF" />
+    <None Include="Images\nalu_navigation_arrow_back_android.svg" Pack="True" PackagePath="buildTransitive\Images\" />
+    <None Include="Images\nalu_navigation_arrow_back_ios.svg" Pack="True" PackagePath="buildTransitive\Images\" />
+    <None Include="Images\nalu_navigation_menu.svg" Pack="True" PackagePath="buildTransitive\Images\" />
+  </ItemGroup>
+
+  <ItemGroup>
+      <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Images\" />
+    <Folder Include="Platforms\Android\" />
+    <Folder Include="Platforms\iOS\" />
+    <Folder Include="Platforms\MacCatalyst\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Nalu.Maui.Core\Nalu.Maui.Core.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.csproj.DotSettings b/Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.csproj.DotSettings
new file mode 100644
index 0000000..6a3f8b8
--- /dev/null
+++ b/Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.csproj.DotSettings
@@ -0,0 +1,6 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=extensions/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=interfaces/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=internals/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=navigationinfo/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=shellinfo/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Source/Nalu.Maui/Nalu.Maui.targets b/Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.targets
similarity index 100%
rename from Source/Nalu.Maui/Nalu.Maui.targets
rename to Source/Nalu.Maui.Navigation/Nalu.Maui.Navigation.targets
diff --git a/Source/Nalu.Maui/Nalu.Maui.csproj.DotSettings b/Source/Nalu.Maui.Navigation/Nalu.Maui.csproj.DotSettings
similarity index 100%
rename from Source/Nalu.Maui/Nalu.Maui.csproj.DotSettings
rename to Source/Nalu.Maui.Navigation/Nalu.Maui.csproj.DotSettings
diff --git a/Source/Nalu.Maui/Navigation/NaluShell.cs b/Source/Nalu.Maui.Navigation/NaluShell.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NaluShell.cs
rename to Source/Nalu.Maui.Navigation/NaluShell.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigateCommand.cs b/Source/Nalu.Maui.Navigation/NavigateCommand.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigateCommand.cs
rename to Source/Nalu.Maui.Navigation/NavigateCommand.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationBehavior.cs b/Source/Nalu.Maui.Navigation/NavigationBehavior.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationBehavior.cs
rename to Source/Nalu.Maui.Navigation/NavigationBehavior.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationConfigurator.cs b/Source/Nalu.Maui.Navigation/NavigationConfigurator.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationConfigurator.cs
rename to Source/Nalu.Maui.Navigation/NavigationConfigurator.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/AbsoluteNavigation.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/AbsoluteNavigation.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/AbsoluteNavigation.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/AbsoluteNavigation.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/INavigationInfo.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/INavigationInfo.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/INavigationInfo.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/INavigationInfo.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/INavigationSegment.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/INavigationSegment.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/INavigationSegment.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/INavigationSegment.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/Navigation.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/Navigation.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/Navigation.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/Navigation.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/NavigationExtensions.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/NavigationExtensions.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/NavigationExtensions.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/NavigationExtensions.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/NavigationPop.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/NavigationPop.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/NavigationPop.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/NavigationPop.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/NavigationSegment.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/NavigationSegment.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/NavigationSegment.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/NavigationSegment.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/NavigationSegmentAttribute.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/NavigationSegmentAttribute.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/NavigationSegmentAttribute.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/NavigationSegmentAttribute.cs
diff --git a/Source/Nalu.Maui/Navigation/NavigationInfo/RelativeNavigation.cs b/Source/Nalu.Maui.Navigation/NavigationInfo/RelativeNavigation.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/NavigationInfo/RelativeNavigation.cs
rename to Source/Nalu.Maui.Navigation/NavigationInfo/RelativeNavigation.cs
diff --git a/Source/Nalu.Maui.Navigation/Platforms/Android/.gitkeep b/Source/Nalu.Maui.Navigation/Platforms/Android/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Source/Nalu.Maui.Navigation/Platforms/MacCatalyst/.gitkeep b/Source/Nalu.Maui.Navigation/Platforms/MacCatalyst/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Source/Nalu.Maui.Navigation/Platforms/Windows/.gitkeep b/Source/Nalu.Maui.Navigation/Platforms/Windows/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Source/Nalu.Maui.Navigation/Platforms/iOS/.gitkeep b/Source/Nalu.Maui.Navigation/Platforms/iOS/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/Source/Nalu.Maui/Navigation/ShellInfo/IShellContentProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/IShellContentProxy.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ShellInfo/IShellContentProxy.cs
rename to Source/Nalu.Maui.Navigation/ShellInfo/IShellContentProxy.cs
diff --git a/Source/Nalu.Maui/Navigation/ShellInfo/IShellItemProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/IShellItemProxy.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ShellInfo/IShellItemProxy.cs
rename to Source/Nalu.Maui.Navigation/ShellInfo/IShellItemProxy.cs
diff --git a/Source/Nalu.Maui/Navigation/ShellInfo/IShellProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/IShellProxy.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ShellInfo/IShellProxy.cs
rename to Source/Nalu.Maui.Navigation/ShellInfo/IShellProxy.cs
diff --git a/Source/Nalu.Maui/Navigation/ShellInfo/IShellSectionProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/IShellSectionProxy.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ShellInfo/IShellSectionProxy.cs
rename to Source/Nalu.Maui.Navigation/ShellInfo/IShellSectionProxy.cs
diff --git a/Source/Nalu.Maui/Navigation/ShellInfo/ShellContentProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/ShellContentProxy.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ShellInfo/ShellContentProxy.cs
rename to Source/Nalu.Maui.Navigation/ShellInfo/ShellContentProxy.cs
diff --git a/Source/Nalu.Maui/Navigation/ShellInfo/ShellItemProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/ShellItemProxy.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ShellInfo/ShellItemProxy.cs
rename to Source/Nalu.Maui.Navigation/ShellInfo/ShellItemProxy.cs
diff --git a/Source/Nalu.Maui/Navigation/ShellInfo/ShellProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/ShellProxy.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ShellInfo/ShellProxy.cs
rename to Source/Nalu.Maui.Navigation/ShellInfo/ShellProxy.cs
diff --git a/Source/Nalu.Maui/Navigation/ShellInfo/ShellSectionProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/ShellSectionProxy.cs
similarity index 100%
rename from Source/Nalu.Maui/Navigation/ShellInfo/ShellSectionProxy.cs
rename to Source/Nalu.Maui.Navigation/ShellInfo/ShellSectionProxy.cs
diff --git a/Source/Nalu.Maui/Nalu.Maui.csproj b/Source/Nalu.Maui/Nalu.Maui.csproj
index 1cee5eb..34db4a4 100644
--- a/Source/Nalu.Maui/Nalu.Maui.csproj
+++ b/Source/Nalu.Maui/Nalu.Maui.csproj
@@ -10,7 +10,6 @@
     <TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
 
-    <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <OutputType>Library</OutputType>
 
@@ -23,39 +22,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>Nalu.Maui.Test</_Parameter1>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="Microsoft.Maui.Controls.XmlnsDefinition">
-      <_Parameter1>https://nalu-development.github.com/nalu</_Parameter1>
-      <_Parameter2>Nalu</_Parameter2>
-    </AssemblyAttribute>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="Nalu.Maui.targets" Pack="True" PackagePath="buildTransitive\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <MauiImage Include="Images\nalu_navigation_arrow_back_android.svg" TintColor="#FFFFFF" />
-    <MauiImage Include="Images\nalu_navigation_arrow_back_ios.svg" TintColor="#FFFFFF" />
-    <MauiImage Include="Images\nalu_navigation_menu.svg" TintColor="#FFFFFF" />
-    <None Include="Images\nalu_navigation_arrow_back_android.svg" Pack="True" PackagePath="buildTransitive\Images\" />
-    <None Include="Images\nalu_navigation_arrow_back_ios.svg" Pack="True" PackagePath="buildTransitive\Images\" />
-    <None Include="Images\nalu_navigation_menu.svg" Pack="True" PackagePath="buildTransitive\Images\" />
-  </ItemGroup>
-
-  <ItemGroup>
-      <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Images\" />
-    <Folder Include="Platforms\Android\" />
-    <Folder Include="Platforms\iOS\" />
-    <Folder Include="Platforms\MacCatalyst\" />
+    <ProjectReference Include="..\Nalu.Maui.Core\Nalu.Maui.Core.csproj" />
+    <ProjectReference Include="..\Nalu.Maui.Navigation\Nalu.Maui.Navigation.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Source/Nalu.Maui/Navigation/NavigationLevel.cs b/Source/Nalu.Maui/Navigation/NavigationLevel.cs
deleted file mode 100644
index 88f905b..0000000
--- a/Source/Nalu.Maui/Navigation/NavigationLevel.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Nalu;
-
-internal enum NavigationLevel
-{
-    /// <summary>
-    /// Navigation targeting the current <see cref="ShellSection"/>.
-    /// </summary>
-    Section,
-
-    /// <summary>
-    /// Navigation targeting the current <see cref="ShellItem"/>.
-    /// </summary>
-    Item,
-
-    /// <summary>
-    /// Navigation targeting a <see cref="ShellItem"/> different from the current one.
-    /// </summary>
-    Shell,
-}

From c75986216ef89d9d96df2d2ec7dc4b716f7cfa7a Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Sun, 17 Mar 2024 19:36:01 +0100
Subject: [PATCH 2/3] Batch navigation

---
 .../Nalu.Maui.DefaultShellSample.csproj       |   1 +
 .../Nalu.Maui.Sample/Nalu.Maui.Sample.csproj  |   1 +
 .../PageModels/FivePageModel.cs               |   6 +-
 .../PageModels/FourPageModel.cs               |   2 +-
 .../PageModels/ThreePageModel.cs              |   3 +
 Samples/Nalu.Maui.Sample/Pages/FivePage.xaml  |   3 +-
 .../Nalu.Maui.Sample/Pages/FivePage.xaml.cs   |   2 +-
 Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml |   2 +
 .../Internals/NavigationService.cs            | 213 ++++++++++++------
 .../Internals/PageNavigationContext.cs        |  13 +-
 .../ShellInfo/IShellProxy.cs                  |   2 +
 .../ShellInfo/IShellSectionProxy.cs           |   3 +-
 .../ShellInfo/ShellProxy.cs                   | 104 ++++++++-
 .../ShellInfo/ShellSectionProxy.cs            |  18 +-
 .../NavigationServiceTests.Fixtures.cs        |  19 +-
 .../Navigation/NavigationServiceTests.cs      |  38 ++--
 16 files changed, 325 insertions(+), 105 deletions(-)

diff --git a/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj b/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj
index 5ff7c90..c120fc8 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj
+++ b/Samples/Nalu.Maui.DefaultShellSample/Nalu.Maui.DefaultShellSample.csproj
@@ -16,6 +16,7 @@
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <UseMaui>true</UseMaui>
 
         <!-- Display name -->
         <ApplicationTitle>Nalu.Maui.DefaultShellSample</ApplicationTitle>
diff --git a/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj b/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj
index 6a6175d..2ad9178 100644
--- a/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj
+++ b/Samples/Nalu.Maui.Sample/Nalu.Maui.Sample.csproj
@@ -16,6 +16,7 @@
         <SingleProject>true</SingleProject>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <UseMaui>true</UseMaui>
 
         <!-- Display name -->
         <ApplicationTitle>Nalu.Maui.Sample</ApplicationTitle>
diff --git a/Samples/Nalu.Maui.Sample/PageModels/FivePageModel.cs b/Samples/Nalu.Maui.Sample/PageModels/FivePageModel.cs
index 4a216d4..3ab04c1 100644
--- a/Samples/Nalu.Maui.Sample/PageModels/FivePageModel.cs
+++ b/Samples/Nalu.Maui.Sample/PageModels/FivePageModel.cs
@@ -1,10 +1,14 @@
 namespace Nalu.Maui.Sample.PageModels;
 
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 
-public class FivePageModel : ObservableObject
+public partial class FivePageModel(INavigationService navigationService) : ObservableObject
 {
     private static int _instanceCount;
 
     public int InstanceCount { get; } = Interlocked.Increment(ref _instanceCount);
+
+    [RelayCommand]
+    private Task GoToThreeAsync() => navigationService.GoToAsync(Navigation.Absolute().ShellContent<OnePageModel>().Add<ThreePageModel>());
 }
diff --git a/Samples/Nalu.Maui.Sample/PageModels/FourPageModel.cs b/Samples/Nalu.Maui.Sample/PageModels/FourPageModel.cs
index 6144111..84069df 100644
--- a/Samples/Nalu.Maui.Sample/PageModels/FourPageModel.cs
+++ b/Samples/Nalu.Maui.Sample/PageModels/FourPageModel.cs
@@ -17,7 +17,7 @@ public partial class FourPageModel(INavigationService navigationService) : Obser
     private Task NavigateToTwoAsync() => navigationService.GoToAsync(Navigation.Relative());
 
     [RelayCommand(AllowConcurrentExecutions = false)]
-    private Task NavigateToFiveAsync() => navigationService.GoToAsync(Navigation.Absolute().ShellContent<FivePageModel>());
+    private Task NavigateToFiveAsync() => navigationService.GoToAsync(Navigation.Absolute(NavigationBehavior.PopAllPagesOnItemChange | NavigationBehavior.IgnoreGuards).ShellContent<FivePageModel>());
 
     [RelayCommand(AllowConcurrentExecutions = false)]
     private Task NavigateToSevenAsync() => navigationService.GoToAsync(Navigation.Absolute().ShellContent<SevenPageModel>());
diff --git a/Samples/Nalu.Maui.Sample/PageModels/ThreePageModel.cs b/Samples/Nalu.Maui.Sample/PageModels/ThreePageModel.cs
index 2e53425..f520513 100644
--- a/Samples/Nalu.Maui.Sample/PageModels/ThreePageModel.cs
+++ b/Samples/Nalu.Maui.Sample/PageModels/ThreePageModel.cs
@@ -14,6 +14,9 @@ public partial class ThreePageModel(INavigationService navigationService, IPopup
     [RelayCommand(AllowConcurrentExecutions = false)]
     private Task PushFourAsync() => navigationService.GoToAsync(Navigation.Relative().Push<FourPageModel>());
 
+    [RelayCommand(AllowConcurrentExecutions = false)]
+    private Task ReplaceSixAsync() => navigationService.GoToAsync(Navigation.Relative(NavigationBehavior.IgnoreGuards).Pop().Push<SixPageModel>());
+
     public async ValueTask<bool> CanLeaveAsync()
         // this will leak: https://github.com/CommunityToolkit/Maui/issues/1676
         => (bool)(await popupService.ShowPopupAsync<CanLeavePopupModel>() ?? false);
diff --git a/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml b/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml
index 5f195d9..b330a6b 100644
--- a/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml
@@ -2,8 +2,6 @@
 
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
              xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.FivePage"
              x:DataType="pageModels1:FivePageModel"
@@ -20,6 +18,7 @@
                     </FormattedString>
                 </Label.FormattedText>
             </Label>
+            <Button Text="Navigate to /One/Three" Command="{Binding GoToThreeCommand}" />
         </VerticalStackLayout>
     </ContentPage.Content>
 </ContentPage>
diff --git a/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml.cs b/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml.cs
index 066496e..e95f1da 100644
--- a/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml.cs
+++ b/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml.cs
@@ -1,6 +1,6 @@
 namespace Nalu.Maui.Sample.Pages;
 
-using Nalu.Maui.Sample.PageModels;
+using PageModels;
 
 public partial class FivePage : ContentPage
 {
diff --git a/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml b/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml
index f389a6b..d1fb35a 100644
--- a/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml
@@ -20,6 +20,8 @@
             </Label>
             <Button Command="{Binding PushFourCommand}"
                     Text="Push Four"/>
+            <Button Command="{Binding ReplaceSixCommand}"
+                    Text="Replace with six"/>
         </VerticalStackLayout>
     </ContentPage.Content>
 </ContentPage>
diff --git a/Source/Nalu.Maui.Navigation/Internals/NavigationService.cs b/Source/Nalu.Maui.Navigation/Internals/NavigationService.cs
index 7b5569a..346f47b 100644
--- a/Source/Nalu.Maui.Navigation/Internals/NavigationService.cs
+++ b/Source/Nalu.Maui.Navigation/Internals/NavigationService.cs
@@ -51,18 +51,39 @@ public async Task InitializeAsync(IShellProxy shellProxy, string contentSegmentN
         await NavigationHelper.SendAppearingAsync(page, intent).ConfigureAwait(true);
     }
 
-    public Task<bool> GoToAsync(INavigationInfo navigation)
+    public async Task<bool> GoToAsync(INavigationInfo navigation)
     {
         if (navigation.Count == 0)
         {
             throw new InvalidOperationException("Navigation must contain at least one segment.");
         }
 
-        return ExecuteNavigationAsync(() => navigation switch
+        var disposeBag = new HashSet<object>();
+        var shellProxy = ShellProxy;
+        shellProxy.BeginNavigation();
+
+        try
+        {
+            return await ExecuteNavigationAsync(() =>
+            {
+                var ignoreGuards = navigation.Behavior?.HasFlag(NavigationBehavior.IgnoreGuards) ?? false;
+                return navigation switch
+                {
+                    { IsAbsolute: true } => ExecuteAbsoluteNavigationAsync(navigation, disposeBag, ignoreGuards),
+                    _ => ExecuteRelativeNavigationAsync(navigation, disposeBag, ignoreGuards: ignoreGuards),
+                };
+            }).ConfigureAwait(true);
+        }
+        finally
         {
-            { IsAbsolute: true } => ExecuteAbsoluteNavigationAsync(navigation),
-            _ => ExecuteRelativeNavigationAsync(navigation),
-        });
+            await shellProxy.CommitNavigationAsync(() =>
+            {
+                foreach (var toDispose in disposeBag)
+                {
+                    DisposePage(toDispose);
+                }
+            }).ConfigureAwait(true);
+        }
     }
 
     internal Page CreatePage(Type pageType, Page? parentPage)
@@ -125,6 +146,7 @@ private void ConfigureBackButtonBehavior(Page page)
 
     private async Task<bool> ExecuteRelativeNavigationAsync(
         INavigationInfo navigation,
+        HashSet<object> disposeBag,
         IShellSectionProxy? section = null,
         List<NavigationStackPage>? stack = null,
         bool sendAppearingToTarget = true,
@@ -163,6 +185,9 @@ private async Task<bool> ExecuteRelativeNavigationAsync(
                         await onCheckingGuardAsync().ConfigureAwait(true);
                     }
 
+                    await shellProxy.CommitNavigationAsync().ConfigureAwait(true);
+                    shellProxy.BeginNavigation();
+
                     await NavigationHelper.SendAppearingAsync(stackPage.Page, null).ConfigureAwait(true);
                     var canLeave = await NavigationHelper.CanLeaveAsync(stackPage.Page).ConfigureAwait(true);
                     if (!canLeave)
@@ -177,11 +202,7 @@ private async Task<bool> ExecuteRelativeNavigationAsync(
                 stack.RemoveAt(stack.Count - 1);
                 await shellProxy.PopAsync(section).ConfigureAwait(true);
 
-                PageNavigationContext.Dispose(stackPage.Page);
-                if (Debugger.IsAttached)
-                {
-                    _leakDetector.Track(stackPage.Page);
-                }
+                disposeBag.Add(stackPage.Page);
             }
             else
             {
@@ -202,6 +223,10 @@ private async Task<bool> ExecuteRelativeNavigationAsync(
         {
             var page = stack[^1].Page;
             var intent = navigation.Intent;
+
+            await shellProxy.CommitNavigationAsync().ConfigureAwait(true);
+            shellProxy.BeginNavigation();
+
             NavigationHelper.AssertIntent(page, intent);
             await NavigationHelper.SendAppearingAsync(page, intent).ConfigureAwait(true);
         }
@@ -209,10 +234,9 @@ private async Task<bool> ExecuteRelativeNavigationAsync(
         return true;
     }
 
-    private async Task<bool> ExecuteAbsoluteNavigationAsync(INavigationInfo navigation)
+    private async Task<bool> ExecuteAbsoluteNavigationAsync(INavigationInfo navigation, HashSet<object> disposeBag, bool ignoreGuards)
     {
         var behavior = navigation.Behavior ?? NavigationBehavior.PopAllPagesOnItemChange;
-        var ignoreGuards = behavior.HasFlag(NavigationBehavior.IgnoreGuards);
         var shellProxy = ShellProxy;
         var rootSegment = navigation[0];
         var rootSegmentName = NavigationHelper.GetSegmentName(rootSegment, Configuration);
@@ -227,17 +251,20 @@ private async Task<bool> ExecuteAbsoluteNavigationAsync(INavigationInfo navigati
         {
             // If we're in the same ShellContent, this is just a relative navigation
             var relativeNavigation = ToRelativeNavigation(navigation, navigationStack);
-            return await ExecuteRelativeNavigationAsync(relativeNavigation, currentSection, navigationStack, ignoreGuards: ignoreGuards).ConfigureAwait(true);
+            return await ExecuteRelativeNavigationAsync(relativeNavigation, disposeBag, currentSection, navigationStack, ignoreGuards: ignoreGuards).ConfigureAwait(true);
         }
 
         var modalPages = navigationStack.Count(page => page.IsModal);
         if (modalPages > 0)
         {
             var popModalsNavigation = PopTimes(modalPages);
-            if (!await ExecuteRelativeNavigationAsync(popModalsNavigation, currentSection, navigationStack, false, ignoreGuards).ConfigureAwait(true))
+            if (!await ExecuteRelativeNavigationAsync(popModalsNavigation, disposeBag, currentSection, navigationStack, false, ignoreGuards).ConfigureAwait(true))
             {
                 return false;
             }
+
+            await shellProxy.CommitNavigationAsync().ConfigureAwait(true);
+            shellProxy.BeginNavigation();
         }
 
         var targetContent = shellProxy.GetContent(rootSegmentName);
@@ -288,7 +315,7 @@ private async Task<bool> ExecuteAbsoluteNavigationAsync(INavigationInfo navigati
             contentsToLeave = [currentContent];
         }
 
-        return await ExecuteCrossContentNavigationAsync(navigation, contentsToLeave, targetContent, leaveMode, ignoreGuards).ConfigureAwait(true);
+        return await ExecuteCrossContentNavigationAsync(navigation, disposeBag, contentsToLeave, targetContent, leaveMode, ignoreGuards).ConfigureAwait(true);
     }
 
     private enum ContentLeaveMode
@@ -300,58 +327,83 @@ private enum ContentLeaveMode
 
     private async Task<bool> ExecuteCrossContentNavigationAsync(
         INavigationInfo navigation,
+        HashSet<object> disposeBag,
         IList<IShellContentProxy> contentsToLeave,
         IShellContentProxy targetContent,
         ContentLeaveMode leaveMode,
         bool ignoreGuards)
     {
         var shellProxy = ShellProxy;
+        shellProxy.BeginNavigation();
 
-        foreach (var content in contentsToLeave)
+        var groupedContentsToLeave = contentsToLeave.GroupBy(content => content.Parent).ToList();
+        foreach (var sectionContentsToLeave in groupedContentsToLeave)
         {
-            var navigationStack = content.Parent.GetNavigationStack().ToList();
-
-            if (leaveMode == ContentLeaveMode.None)
+            foreach (var contentToLeave in sectionContentsToLeave)
             {
-                await EnsureContentIsSelectedAsync().ConfigureAwait(true);
-                await NavigationHelper.SendDisappearingAsync(navigationStack[^1].Page).ConfigureAwait(true);
-                continue;
-            }
+                var navigationStack = contentToLeave.Parent.GetNavigationStack(contentToLeave).ToList();
 
-            var popCount = navigationStack.Count - 1;
-            if (popCount > 0)
-            {
-                var popNavigation = PopTimes(popCount);
-                if (!await ExecuteRelativeNavigationAsync(
-                        popNavigation,
-                        content.Parent,
-                        navigationStack,
-                        false,
-                        ignoreGuards,
-                        EnsureContentIsSelectedAsync).ConfigureAwait(true))
+                if (leaveMode == ContentLeaveMode.None)
+                {
+                    await EnsureContentIsSelectedAsync().ConfigureAwait(true);
+                    await NavigationHelper.SendDisappearingAsync(navigationStack[^1].Page).ConfigureAwait(true);
+                    continue;
+                }
+
+                var popCount = navigationStack.Count - 1;
+                if (popCount > 0)
+                {
+                    var popNavigation = PopTimes(popCount);
+                    if (!await ExecuteRelativeNavigationAsync(
+                            popNavigation,
+                            disposeBag,
+                            contentToLeave.Parent,
+                            navigationStack,
+                            false,
+                            ignoreGuards,
+                            EnsureContentIsSelectedAsync).ConfigureAwait(true))
+                    {
+                        return false;
+                    }
+                }
+
+                var contentPage = contentToLeave.Page!;
+                if (!ignoreGuards && contentToLeave.HasGuard)
+                {
+                    await EnsureContentIsSelectedAsync().ConfigureAwait(true);
+
+                    await shellProxy.CommitNavigationAsync().ConfigureAwait(true);
+                    shellProxy.BeginNavigation();
+
+                    await NavigationHelper.SendAppearingAsync(contentPage, null).ConfigureAwait(true);
+                    if (!await NavigationHelper.CanLeaveAsync(contentPage).ConfigureAwait(true))
+                    {
+                        return false;
+                    }
+                }
+
+                await NavigationHelper.SendDisappearingAsync(contentPage).ConfigureAwait(true);
+                await NavigationHelper.SendLeavingAsync(contentPage).ConfigureAwait(true);
+
+                if (leaveMode == ContentLeaveMode.Destroy)
                 {
-                    return false;
+                    disposeBag.Add(contentToLeave);
                 }
+
+                Task EnsureContentIsSelectedAsync()
+                    => shellProxy.CurrentItem.CurrentSection.CurrentContent == contentToLeave
+                        ? Task.CompletedTask
+                        : ShellProxy.SelectContentAsync(contentToLeave.SegmentName);
             }
 
-            var contentPage = content.Page!;
-            if (!ignoreGuards && content.HasGuard)
+            if (leaveMode == ContentLeaveMode.Destroy)
             {
-                await EnsureContentIsSelectedAsync().ConfigureAwait(true);
-                await NavigationHelper.SendAppearingAsync(contentPage, null).ConfigureAwait(true);
-                if (!await NavigationHelper.CanLeaveAsync(contentPage).ConfigureAwait(true))
+                var sectionToLeave = sectionContentsToLeave.Key;
+                if (sectionToLeave != targetContent.Parent)
                 {
-                    return false;
+                    disposeBag.Add(sectionToLeave);
                 }
             }
-
-            await NavigationHelper.SendDisappearingAsync(contentPage).ConfigureAwait(true);
-            await NavigationHelper.SendLeavingAsync(contentPage).ConfigureAwait(true);
-
-            Task EnsureContentIsSelectedAsync()
-                => shellProxy.CurrentItem.CurrentSection.CurrentContent == content
-                    ? Task.CompletedTask
-                    : ShellProxy.SelectContentAsync(content.SegmentName);
         }
 
         // Send entering
@@ -361,27 +413,17 @@ Task EnsureContentIsSelectedAsync()
         await NavigationHelper.SendEnteringAsync(targetContentPage, intent).ConfigureAwait(true);
         await ShellProxy.SelectContentAsync(targetContent.SegmentName).ConfigureAwait(true);
 
-        if (leaveMode == ContentLeaveMode.Destroy)
-        {
-            foreach (var content in contentsToLeave)
-            {
-                if (Debugger.IsAttached)
-                {
-                    _leakDetector.Track(content.Page!);
-                }
-
-                content.DestroyContent();
-            }
-        }
-
         if (!targetIsShellContent)
         {
             var targetSection = targetContent.Parent;
-            var targetStack = targetSection.GetNavigationStack().ToList();
+            var targetStack = targetSection.GetNavigationStack(targetContent).ToList();
             var relativeNavigation = ToRelativeNavigation(navigation, targetStack);
-            return await ExecuteRelativeNavigationAsync(relativeNavigation, targetSection, targetStack, ignoreGuards: ignoreGuards).ConfigureAwait(true);
+            var result = await ExecuteRelativeNavigationAsync(relativeNavigation, disposeBag, targetSection, targetStack, ignoreGuards: ignoreGuards).ConfigureAwait(true);
+            await shellProxy.CommitNavigationAsync().ConfigureAwait(true);
+            return result;
         }
 
+        await shellProxy.CommitNavigationAsync().ConfigureAwait(true);
         await NavigationHelper.SendAppearingAsync(targetContentPage, intent).ConfigureAwait(true);
         return true;
     }
@@ -437,6 +479,49 @@ private async Task<bool> ExecuteNavigationAsync(Func<Task<bool>> navigationFunc)
         }
     }
 
+    private void DisposePage(object toDispose)
+    {
+        switch (toDispose)
+        {
+            case Page page:
+            {
+                PageNavigationContext.Dispose(page);
+                if (Debugger.IsAttached)
+                {
+                    _leakDetector.Track(page);
+                }
+
+                break;
+            }
+
+            case IShellContentProxy contentProxy:
+            {
+                var contentPage = contentProxy.Page;
+                if (contentPage is not null)
+                {
+                    contentProxy.DestroyContent();
+                    if (Debugger.IsAttached)
+                    {
+                        _leakDetector.Track(contentPage);
+                    }
+                }
+
+                break;
+            }
+
+            case IShellSectionProxy sectionProxy:
+            {
+                sectionProxy.RemoveStackPages();
+                break;
+            }
+
+            default:
+            {
+                throw new InvalidOperationException();
+            }
+        }
+    }
+
     private static INavigationInfo PopTimes(int popCount)
     {
         var navigation = Navigation.Relative();
diff --git a/Source/Nalu.Maui.Navigation/Internals/PageNavigationContext.cs b/Source/Nalu.Maui.Navigation/Internals/PageNavigationContext.cs
index 69c7d0c..2c64967 100644
--- a/Source/Nalu.Maui.Navigation/Internals/PageNavigationContext.cs
+++ b/Source/Nalu.Maui.Navigation/Internals/PageNavigationContext.cs
@@ -8,7 +8,18 @@ internal sealed class PageNavigationContext(IServiceScope serviceScope) : IDispo
 
     private static readonly BindableProperty _navigationContextProperty = BindableProperty.CreateAttached("PageNavigationContext", typeof(PageNavigationContext), typeof(PageNavigationContext), null);
 
-    public static PageNavigationContext Get(Page page) => (PageNavigationContext)page.GetValue(_navigationContextProperty) ?? throw new InvalidOperationException("Cannot navigate to a page not created by Nalu navigation.");
+    public static PageNavigationContext Get(Page page)
+    {
+        var pageNavigationContext = (PageNavigationContext)page.GetValue(_navigationContextProperty);
+#pragma warning disable IDE0270
+        if (pageNavigationContext is null)
+#pragma warning restore IDE0270
+        {
+            throw new InvalidOperationException("Cannot navigate to a page not created by Nalu navigation.");
+        }
+
+        return pageNavigationContext;
+    }
 
     public static void Set(Page page, PageNavigationContext? context) => page.SetValue(_navigationContextProperty, context);
 
diff --git a/Source/Nalu.Maui.Navigation/ShellInfo/IShellProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/IShellProxy.cs
index 4738e57..5d1c099 100644
--- a/Source/Nalu.Maui.Navigation/ShellInfo/IShellProxy.cs
+++ b/Source/Nalu.Maui.Navigation/ShellInfo/IShellProxy.cs
@@ -2,6 +2,8 @@ namespace Nalu;
 
 internal interface IShellProxy
 {
+    bool BeginNavigation();
+    Task CommitNavigationAsync(Action? completeAction = null);
     IShellItemProxy CurrentItem { get; }
     IReadOnlyList<IShellItemProxy> Items { get; }
     Color GetToolbarIconColor(Page page);
diff --git a/Source/Nalu.Maui.Navigation/ShellInfo/IShellSectionProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/IShellSectionProxy.cs
index f04f471..fea91ed 100644
--- a/Source/Nalu.Maui.Navigation/ShellInfo/IShellSectionProxy.cs
+++ b/Source/Nalu.Maui.Navigation/ShellInfo/IShellSectionProxy.cs
@@ -6,6 +6,7 @@ internal interface IShellSectionProxy
     IShellContentProxy CurrentContent { get; }
     IReadOnlyList<IShellContentProxy> Contents { get; }
     IShellItemProxy Parent { get; }
-    IEnumerable<NavigationStackPage> GetNavigationStack();
+    IEnumerable<NavigationStackPage> GetNavigationStack(IShellContentProxy? content = null);
     Task PopAsync();
+    void RemoveStackPages();
 }
diff --git a/Source/Nalu.Maui.Navigation/ShellInfo/ShellProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/ShellProxy.cs
index 38dbc8f..63ee430 100644
--- a/Source/Nalu.Maui.Navigation/ShellInfo/ShellProxy.cs
+++ b/Source/Nalu.Maui.Navigation/ShellInfo/ShellProxy.cs
@@ -5,9 +5,13 @@ namespace Nalu;
 internal class ShellProxy : IShellProxy, IDisposable
 {
     private readonly NaluShell _shell;
+
     public IShellItemProxy CurrentItem { get; private set; } = null!;
     public IReadOnlyList<IShellItemProxy> Items { get; private set; } = null!;
     private Dictionary<string, IShellContentProxy> _contentsBySegmentName = null!;
+    private string? _navigationTarget;
+    private bool _contentChanged;
+    private IShellSectionProxy? _navigationCurrentSection;
 
     public ShellProxy(NaluShell shell)
     {
@@ -18,6 +22,61 @@ public ShellProxy(NaluShell shell)
         ((IShellController)shell).StructureChanged += ShellOnStructureChanged;
     }
 
+    public bool BeginNavigation()
+    {
+        if (_navigationTarget is not null)
+        {
+            // Already inside a batch
+            return false;
+        }
+
+        _navigationTarget = _shell.CurrentState.Location.OriginalString;
+        _navigationCurrentSection = CurrentItem.CurrentSection;
+        return true;
+    }
+
+    public async Task CommitNavigationAsync(Action? completeAction = null)
+    {
+        if (_navigationTarget is not { } targetState || targetState == _shell.CurrentState.Location.OriginalString)
+        {
+            if (completeAction is not null)
+            {
+                _shell.SetIsNavigating(true);
+                completeAction();
+                _shell.SetIsNavigating(false);
+            }
+
+            return;
+        }
+
+        try
+        {
+            _shell.SetIsNavigating(true);
+
+            var contentChanged = _contentChanged;
+            _navigationTarget = null;
+            _contentChanged = false;
+            _navigationCurrentSection = null;
+
+            await _shell.GoToAsync(targetState, true).ConfigureAwait(true);
+            await Task.Yield();
+
+            if (contentChanged)
+            {
+                // Wait for the animation to complete
+                // I know this is a hack, but I don't see any other way to do this
+                // given `shell.GoToAsync` does not wait for the animation to complete
+                await Task.Delay(600).ConfigureAwait(true);
+            }
+
+            completeAction?.Invoke();
+        }
+        finally
+        {
+            _shell.SetIsNavigating(false);
+        }
+    }
+
     public IShellContentProxy GetContent(string segmentName) => _contentsBySegmentName[segmentName];
 
     public Color GetToolbarIconColor(Page page) => Shell.GetTitleColor(page.IsSet(Shell.TitleColorProperty) ? page : _shell);
@@ -28,11 +87,19 @@ public async Task PushAsync(string segmentName, Page page)
         {
             _shell.SetIsNavigating(true);
 
-            var baseRoute = _shell.CurrentState.Location.OriginalString;
+            var baseRoute = _navigationTarget ?? _shell.CurrentState.Location.OriginalString;
             var finalRoute = $"{baseRoute}/{segmentName}";
             Routing.UnRegisterRoute(finalRoute);
             Routing.RegisterRoute(finalRoute, new FixedRouteFactory(page));
-            await _shell.GoToAsync(finalRoute).ConfigureAwait(true);
+
+            if (_navigationTarget != null)
+            {
+                _navigationTarget = finalRoute;
+            }
+            else
+            {
+                await _shell.GoToAsync(finalRoute).ConfigureAwait(true);
+            }
         }
         finally
         {
@@ -46,7 +113,16 @@ public async Task PopAsync(IShellSectionProxy? section = null)
         {
             _shell.SetIsNavigating(true);
             section ??= CurrentItem.CurrentSection;
-            await section.PopAsync().ConfigureAwait(true);
+
+            if (section == _navigationCurrentSection && _navigationTarget != null)
+            {
+                var previousSegmentEnd = _navigationTarget.LastIndexOf('/');
+                _navigationTarget = _navigationTarget[..previousSegmentEnd];
+            }
+            else
+            {
+                await section.PopAsync().ConfigureAwait(true);
+            }
         }
         finally
         {
@@ -60,33 +136,39 @@ public async Task SelectContentAsync(string segmentName)
         {
             _shell.SetIsNavigating(true);
             var contentProxy = (ShellContentProxy)GetContent(segmentName);
+            if (CurrentItem.CurrentSection.CurrentContent == contentProxy)
+            {
+                return;
+            }
+
+            _contentChanged = true;
             var content = contentProxy.Content;
             var section = (ShellSection)content.Parent;
             var item = (ShellItem)section.Parent;
-            var navigated = false;
+
+            if (_navigationTarget is not null)
+            {
+                _navigationTarget = contentProxy.Parent.GetNavigationStack(contentProxy).LastOrDefault()?.Route
+                                    ?? $"//{item.Route}/{section.Route}/{content.Route}";
+                return;
+            }
 
             if (section.CurrentItem != content)
             {
                 section.CurrentItem = content;
-                navigated = true;
             }
 
             if (item.CurrentItem != section)
             {
                 item.CurrentItem = section;
-                navigated = true;
             }
 
             if (_shell.CurrentItem != item)
             {
                 _shell.CurrentItem = item;
-                navigated = true;
             }
 
-            if (navigated)
-            {
-                await Task.Delay(200).ConfigureAwait(true);
-            }
+            await Task.Delay(250).ConfigureAwait(true);
         }
         finally
         {
diff --git a/Source/Nalu.Maui.Navigation/ShellInfo/ShellSectionProxy.cs b/Source/Nalu.Maui.Navigation/ShellInfo/ShellSectionProxy.cs
index 05b3fb7..089a38a 100644
--- a/Source/Nalu.Maui.Navigation/ShellInfo/ShellSectionProxy.cs
+++ b/Source/Nalu.Maui.Navigation/ShellInfo/ShellSectionProxy.cs
@@ -24,9 +24,9 @@ public ShellSectionProxy(ShellSection section, IShellItemProxy parent)
         section.PropertyChanged += SectionOnPropertyChanged;
     }
 
-    public IEnumerable<NavigationStackPage> GetNavigationStack()
+    public IEnumerable<NavigationStackPage> GetNavigationStack(IShellContentProxy? content = null)
     {
-        var content = CurrentContent;
+        content ??= CurrentContent;
         if (content.Page is null)
         {
             yield break;
@@ -35,6 +35,11 @@ public IEnumerable<NavigationStackPage> GetNavigationStack()
         var baseRoute = $"//{Parent.SegmentName}/{SegmentName}/{content.SegmentName}";
         yield return new NavigationStackPage(baseRoute, content.SegmentName, content.Page, false);
 
+        if (content != CurrentContent)
+        {
+            yield break;
+        }
+
         var navigation = _section.Navigation;
         var route = new StringBuilder(baseRoute);
         foreach (var stackPage in navigation.NavigationStack)
@@ -74,6 +79,15 @@ public Task PopAsync()
         return navigation.PopAsync(animated);
     }
 
+    public void RemoveStackPages()
+    {
+        var navigation = _section.Navigation;
+        while (navigation.NavigationStack.Count > 1)
+        {
+            navigation.RemovePage(navigation.NavigationStack[^1]);
+        }
+    }
+
     public void Dispose() => _section.PropertyChanged -= SectionOnPropertyChanged;
 
     private void SectionOnPropertyChanged(object? sender, PropertyChangedEventArgs args)
diff --git a/Tests/Nalu.Maui.Test/Navigation/NavigationServiceTests.Fixtures.cs b/Tests/Nalu.Maui.Test/Navigation/NavigationServiceTests.Fixtures.cs
index 1708680..d59f83e 100644
--- a/Tests/Nalu.Maui.Test/Navigation/NavigationServiceTests.Fixtures.cs
+++ b/Tests/Nalu.Maui.Test/Navigation/NavigationServiceTests.Fixtures.cs
@@ -56,11 +56,11 @@ private int CurrentContentIndex
             }
         }
 
-        public IEnumerable<NavigationStackPage> GetNavigationStack()
+        public IEnumerable<NavigationStackPage> GetNavigationStack(IShellContentProxy? content = null)
         {
             EnsureStacks();
 
-            var content = CurrentContent;
+            content ??= CurrentContent;
             if (content.Page is null)
             {
                 yield break;
@@ -69,6 +69,11 @@ public IEnumerable<NavigationStackPage> GetNavigationStack()
             var baseRoute = $"//{Parent.SegmentName}/{SegmentName}/{content.SegmentName}";
             yield return new NavigationStackPage(baseRoute, content.SegmentName, content.Page, false);
 
+            if (content.Parent.CurrentContent != content)
+            {
+                yield break;
+            }
+
             var currentContentIndex = CurrentContentIndex;
             var navigationStack = _navigationStacks[currentContentIndex];
             var route = new StringBuilder(baseRoute);
@@ -89,6 +94,11 @@ public Task PopAsync()
             return Task.CompletedTask;
         }
 
+        public void RemoveStackPages()
+        {
+            // Not needed for tests.
+        }
+
         public void Push(Page page)
         {
             EnsureStacks();
@@ -240,6 +250,11 @@ private void ConfigureTestAsync(string shellContents)
 
         _shellProxy.Items.Returns(items);
         _shellProxy.CurrentItem.Returns(items[0]);
+        _shellProxy.CommitNavigationAsync(Arg.Any<Action>()).Returns(callInfo =>
+        {
+            callInfo.Arg<Action>()?.Invoke();
+            return Task.CompletedTask;
+        });
         _shellProxy
             .GetContent(Arg.Any<string>())
             .Returns(callInfo =>
diff --git a/Tests/Nalu.Maui.Test/Navigation/NavigationServiceTests.cs b/Tests/Nalu.Maui.Test/Navigation/NavigationServiceTests.cs
index cccae13..5bd42d3 100644
--- a/Tests/Nalu.Maui.Test/Navigation/NavigationServiceTests.cs
+++ b/Tests/Nalu.Maui.Test/Navigation/NavigationServiceTests.cs
@@ -185,8 +185,8 @@ public async Task NavigationServiceWhenPoppingAPageShouldSendDisappearingAndLeav
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnAppearingAsync();
+            model2.Dispose();
         });
         model1.DidNotReceive().OnEnteringAsync();
     }
@@ -216,8 +216,8 @@ public async Task NavigationServiceWhenPoppingAPageWithIntentShouldSendDisappear
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnAppearingAsync(intent);
+            model2.Dispose();
         });
         model1.DidNotReceive().OnEnteringAsync(intent);
         model1.DidNotReceive().OnEnteringAsync();
@@ -275,11 +275,11 @@ public async Task NavigationServiceWhenPoppingMultiplePagesShouldSendDisappearin
             model3.OnDisappearingAsync();
             model3.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model3.Dispose();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnAppearingAsync();
+            model3.Dispose();
+            model2.Dispose();
         });
         model1.DidNotReceive().OnEnteringAsync();
         model2.DidNotReceive().OnAppearingAsync();
@@ -344,8 +344,8 @@ public async Task NavigationServiceWhenPoppingAGuardedPageEvaluatesGuardAndProce
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnAppearingAsync();
+            model2.Dispose();
         });
     }
 
@@ -380,14 +380,14 @@ public async Task NavigationServiceWhenPoppingANonCurrentGuardedPageAppearsAndEv
             model3.OnDisappearingAsync();
             model3.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model3.Dispose();
             model2.OnAppearingAsync();
             model2.CanLeaveAsync();
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnAppearingAsync();
+            model3.Dispose();
+            model2.Dispose();
         });
     }
 
@@ -422,8 +422,8 @@ public async Task NavigationServiceWhenDoingAbsoluteNavigationOnSameContentShoul
             model3.OnDisappearingAsync();
             model3.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model3.Dispose();
             model2.OnAppearingAsync();
+            model3.Dispose();
         });
         _shellProxy.DidNotReceive().SelectContentAsync(Arg.Any<string>());
     }
@@ -457,10 +457,10 @@ public async Task NavigationServiceWhenDoingAbsoluteNavigationOnSameSectionShoul
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model5.OnEnteringAsync();
             _shellProxy.SelectContentAsync(nameof(Page5));
             model5.OnAppearingAsync();
+            model2.Dispose();
         });
     }
 
@@ -496,12 +496,12 @@ public async Task NavigationServiceWhenDoingAbsoluteNavigationCanPushOnTheNewSta
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model5.OnEnteringAsync();
             _shellProxy.SelectContentAsync(nameof(Page5));
             model4.OnEnteringAsync();
             _shellProxy.PushAsync(nameof(Page4), page4);
             model4.OnAppearingAsync();
+            model2.Dispose();
         });
     }
 
@@ -574,10 +574,10 @@ public async Task NavigationServiceWhenDoingAbsoluteNavigationOnSameItemButDiffe
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model5.OnEnteringAsync();
             _shellProxy.SelectContentAsync(nameof(Page5));
             model5.OnAppearingAsync();
+            model2.Dispose();
         });
         model1.DidNotReceive().OnLeavingAsync();
         model1.DidNotReceive().OnAppearingAsync();
@@ -614,12 +614,12 @@ public async Task NavigationServiceWhenDoingAbsoluteNavigationOnSameItemButDiffe
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnLeavingAsync();
             model5.OnEnteringAsync();
             _shellProxy.SelectContentAsync(nameof(Page5));
-            model1.Dispose();
             model5.OnAppearingAsync();
+            model2.Dispose();
+            model1.Dispose();
         });
     }
 
@@ -652,12 +652,12 @@ public async Task NavigationServiceWhenDoingAbsoluteNavigationOnDifferentItemSho
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnLeavingAsync();
             model5.OnEnteringAsync();
             _shellProxy.SelectContentAsync(nameof(Page5));
-            model1.Dispose();
             model5.OnAppearingAsync();
+            model2.Dispose();
+            model1.Dispose();
         });
     }
 
@@ -731,12 +731,12 @@ public async Task NavigationServiceWhenDoingAbsoluteNavigationWithIgnoreGuardsSh
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnLeavingAsync();
             model5.OnEnteringAsync();
             _shellProxy.SelectContentAsync(nameof(Page5));
-            model1.Dispose();
             model5.OnAppearingAsync();
+            model2.Dispose();
+            model1.Dispose();
         });
         model2.DidNotReceive().CanLeaveAsync();
     }
@@ -772,12 +772,12 @@ public async Task NavigationServiceWhenDoingAbsoluteNavigationEvaluatesGuards()
             model2.OnDisappearingAsync();
             model2.OnLeavingAsync();
             _shellProxy.PopAsync(shellSection);
-            model2.Dispose();
             model1.OnLeavingAsync();
             model5.OnEnteringAsync();
             _shellProxy.SelectContentAsync(nameof(Page5));
-            model1.Dispose();
             model5.OnAppearingAsync();
+            model2.Dispose();
+            model1.Dispose();
         });
     }
 

From 8d3df9f0775d3e292f9df81988113e0ca3ed3712 Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Mon, 18 Mar 2024 16:07:44 +0100
Subject: [PATCH 3/3] Cleanup

---
 README.md                                     | 19 ++++++++++++++++---
 .../Pages/FivePage.xaml                       |  4 +---
 .../Pages/FourPage.xaml                       |  4 +---
 .../Pages/OnePage.xaml                        |  3 +--
 .../Pages/SevenPage.xaml                      |  4 +---
 .../Pages/SixPage.xaml                        |  4 +---
 .../Pages/ThreePage.xaml                      |  3 +--
 .../Pages/TwoPage.xaml                        |  3 +--
 Samples/Nalu.Maui.Sample/Pages/FivePage.xaml  |  4 ++--
 Samples/Nalu.Maui.Sample/Pages/FourPage.xaml  |  4 ++--
 Samples/Nalu.Maui.Sample/Pages/OnePage.xaml   |  3 +--
 Samples/Nalu.Maui.Sample/Pages/SevenPage.xaml |  4 +---
 Samples/Nalu.Maui.Sample/Pages/SixPage.xaml   |  4 +---
 Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml |  3 +--
 14 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index b0bf75e..96ddc57 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,24 @@
 
 <a style="float:right;text-decoration:none;margin-top:-66px;padding:8px 16px;color: #2C479D;border-radius:8px;box-shadow: 0 0 4px #2C479D;font-weight: 600;background: #f6fafe;" target="_blank" href="https://buymeacoffee.com/albyrock87">🍕&nbsp;<span class="bmc-btn-text">Buy me a pizza</span></a>
 
-## Nalu.Maui [![Nalu.Maui NuGet Package](https://img.shields.io/nuget/v/Nalu.Maui.svg)](https://www.nuget.org/packages/Nalu.Maui/) [![Nalu.Maui NuGet Package Downloads](https://img.shields.io/nuget/dt/Nalu.Maui)](https://www.nuget.org/packages/Nalu.Maui/)
+## Nalu.Maui
 
 Nalu.Maui is a library that solves some problems like navigation between pages in a MAUI application.
 
-### Navigation
+### Navigation [![Nalu.Maui.Navigation NuGet Package](https://img.shields.io/nuget/v/Nalu.Maui.Navigation.svg)](https://www.nuget.org/packages/Nalu.Maui/) [![Nalu.Maui NuGet Package Downloads](https://img.shields.io/nuget/dt/Nalu.Maui.Navigation)](https://www.nuget.org/packages/Nalu.Maui.Navigation/)
+
+#### Migration from v2.x to v3.x
+
+Migration from `Nalu.Maui` v2.x to v3.x is not automatic, you need to update your code to use the new `Nalu.Maui.Navigation` package.
+```
+xmlns:nalu="https://nalu-development.github.com/nalu"
+```
+becomes
+```
+xmlns:nalu="https://nalu-development.github.com/nalu/navigation"
+```
+
+#### Why Nalu navigation?
 
 Unfortunately MAUI navigation (NavigationPage, or Shell) do not provide automatic page/view model disposal as [widely explained in this issue](https://github.com/dotnet/maui/issues/7354).
 This is a problem because it can lead to memory/event leaks.
@@ -122,7 +135,7 @@ Use `nalu:Navigation.PageType` to specify the page type for each `ShellContent`.
 <nalu:NaluShell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                 xmlns:pages="clr-namespace:Nalu.Maui.Sample.PageModels"
-                xmlns:nalu="https://nalu-development.github.com/nalu"
+                xmlns:nalu="https://nalu-development.github.com/nalu/navigation"
                 x:Class="Nalu.Maui.Sample.AppShell">
     <FlyoutItem Route="main"
                 FlyoutDisplayOptions="AsMultipleItems">
diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/FivePage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/FivePage.xaml
index d0da851..8bed80a 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Pages/FivePage.xaml
+++ b/Samples/Nalu.Maui.DefaultShellSample/Pages/FivePage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.FivePage"
-             x:DataType="pageModels1:FivePageModel"
+             x:DataType="pageModels:FivePageModel"
              Title="Page Five"
              Padding="16">
     <ContentPage.Content>
diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/FourPage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/FourPage.xaml
index d967095..9b71f90 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Pages/FourPage.xaml
+++ b/Samples/Nalu.Maui.DefaultShellSample/Pages/FourPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.FourPage"
-             x:DataType="pageModels1:FourPageModel"
+             x:DataType="pageModels:FourPageModel"
              Title="Page Four"
              Padding="16"
              Shell.PresentationMode="Modal">
diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/OnePage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/OnePage.xaml
index 19bdb82..a232cdb 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Pages/OnePage.xaml
+++ b/Samples/Nalu.Maui.DefaultShellSample/Pages/OnePage.xaml
@@ -2,9 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.OnePage"
-             x:DataType="pageModels1:OnePageModel"
+             x:DataType="pageModels:OnePageModel"
              Title="Page One"
              Padding="16">
 
diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/SevenPage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/SevenPage.xaml
index 6c90135..91d4f9f 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Pages/SevenPage.xaml
+++ b/Samples/Nalu.Maui.DefaultShellSample/Pages/SevenPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.SevenPage"
-             x:DataType="pageModels1:SevenPageModel"
+             x:DataType="pageModels:SevenPageModel"
              Title="Page Seven"
              Padding="16">
     <ContentPage.Content>
diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/SixPage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/SixPage.xaml
index a8ab963..af314d7 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Pages/SixPage.xaml
+++ b/Samples/Nalu.Maui.DefaultShellSample/Pages/SixPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.SixPage"
-             x:DataType="pageModels1:SixPageModel"
+             x:DataType="pageModels:SixPageModel"
              Title="Page Six"
              Padding="16">
     <ContentPage.Content>
diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/ThreePage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/ThreePage.xaml
index b5f4972..294d5d7 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Pages/ThreePage.xaml
+++ b/Samples/Nalu.Maui.DefaultShellSample/Pages/ThreePage.xaml
@@ -3,9 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.ThreePage"
-             x:DataType="pageModels1:ThreePageModel"
+             x:DataType="pageModels:ThreePageModel"
              Title="Page Three"
              Padding="16">
     <ContentPage.Content>
diff --git a/Samples/Nalu.Maui.DefaultShellSample/Pages/TwoPage.xaml b/Samples/Nalu.Maui.DefaultShellSample/Pages/TwoPage.xaml
index ed199a5..0102c1e 100644
--- a/Samples/Nalu.Maui.DefaultShellSample/Pages/TwoPage.xaml
+++ b/Samples/Nalu.Maui.DefaultShellSample/Pages/TwoPage.xaml
@@ -3,9 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.DefaultShellSample.PageModels"
              x:Class="Nalu.Maui.DefaultShellSample.Pages.TwoPage"
-             x:DataType="pageModels1:TwoPageModel"
+             x:DataType="pageModels:TwoPageModel"
              Title="Page Two"
              Padding="16">
     <ContentPage.Content>
diff --git a/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml b/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml
index b330a6b..463f197 100644
--- a/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/FivePage.xaml
@@ -2,9 +2,9 @@
 
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
+             xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.FivePage"
-             x:DataType="pageModels1:FivePageModel"
+             x:DataType="pageModels:FivePageModel"
              Title="Page Five"
              Padding="16">
     <ContentPage.Content>
diff --git a/Samples/Nalu.Maui.Sample/Pages/FourPage.xaml b/Samples/Nalu.Maui.Sample/Pages/FourPage.xaml
index 5188d7a..3d6a6f3 100644
--- a/Samples/Nalu.Maui.Sample/Pages/FourPage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/FourPage.xaml
@@ -2,9 +2,9 @@
 
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
+             xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.FourPage"
-             x:DataType="pageModels1:FourPageModel"
+             x:DataType="pageModels:FourPageModel"
              Title="Page Four"
              Padding="16"
              Shell.PresentationMode="Modal">
diff --git a/Samples/Nalu.Maui.Sample/Pages/OnePage.xaml b/Samples/Nalu.Maui.Sample/Pages/OnePage.xaml
index 4b8546c..8302580 100644
--- a/Samples/Nalu.Maui.Sample/Pages/OnePage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/OnePage.xaml
@@ -2,9 +2,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.OnePage"
-             x:DataType="pageModels1:OnePageModel"
+             x:DataType="pageModels:OnePageModel"
              Title="Page One"
              Padding="16">
 
diff --git a/Samples/Nalu.Maui.Sample/Pages/SevenPage.xaml b/Samples/Nalu.Maui.Sample/Pages/SevenPage.xaml
index 8d47c41..560202f 100644
--- a/Samples/Nalu.Maui.Sample/Pages/SevenPage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/SevenPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.SevenPage"
-             x:DataType="pageModels1:SevenPageModel"
+             x:DataType="pageModels:SevenPageModel"
              Title="Page Seven"
              Padding="16">
     <ContentPage.Content>
diff --git a/Samples/Nalu.Maui.Sample/Pages/SixPage.xaml b/Samples/Nalu.Maui.Sample/Pages/SixPage.xaml
index 17fc083..0cca52b 100644
--- a/Samples/Nalu.Maui.Sample/Pages/SixPage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/SixPage.xaml
@@ -3,10 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:nalu="https://nalu-development.github.com/nalu"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.SixPage"
-             x:DataType="pageModels1:SixPageModel"
+             x:DataType="pageModels:SixPageModel"
              Title="Page Six"
              Padding="16">
     <ContentPage.Content>
diff --git a/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml b/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml
index d1fb35a..5bd3ae3 100644
--- a/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml
+++ b/Samples/Nalu.Maui.Sample/Pages/ThreePage.xaml
@@ -3,9 +3,8 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:pageModels="clr-namespace:Nalu.Maui.Sample.PageModels"
-             xmlns:pageModels1="clr-namespace:Nalu.Maui.Sample.PageModels"
              x:Class="Nalu.Maui.Sample.Pages.ThreePage"
-             x:DataType="pageModels1:ThreePageModel"
+             x:DataType="pageModels:ThreePageModel"
              Title="Page Three"
              Padding="16">
     <ContentPage.Content>