Refactor navigation logic

src/Packages.props

@@ -7,5 +7,6 @@
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />
     <PackageReference Update="NativeMethods" Version="0.0.3" />
     <PackageReference Update="Microsoft.VisualStudio.CoreUtility" Version="17.2.3194" />
+    <PackageReference Update="CommunityToolkit.Diagnostics" Version="8.0.0" />
   </ItemGroup>
 </Project>

src/Wpf.Ui.Demo/App.xaml.cs

@@ -93,6 +93,8 @@ public partial class App
 
             services.AddScoped<Views.Pages.Icons>();
             services.AddScoped<IconsViewModel>();
+
+            services.AddScoped<BreadcrumbPagesViewModel>();
 
             // Test windows
             services.AddTransient<Views.Windows.TaskManagerWindow>();

src/Wpf.Ui.Demo/ViewModels/BreadcrumbPagesViewModel.cs

@@ -0,0 +1,31 @@
+using System.Windows.Input;
+using Microsoft.Toolkit.Mvvm.Input;
+using Wpf.Ui.Mvvm.Contracts;
+
+namespace Wpf.Ui.Demo.ViewModels;
+
+public class BreadcrumbPagesViewModel
+{
+    public RelayCommand<string> OnClickCommand { get; }
+    public ICommand OnNavigateBackCommand { get; }
+
+    private readonly INavigationService _navigationService;
+
+    public BreadcrumbPagesViewModel(INavigationService navigationService)
+    {
+        _navigationService = navigationService;
+
+        OnClickCommand = new RelayCommand<string>(OnClick);
+        OnNavigateBackCommand = new RelayCommand(OnNavigateBack);
+    }
+
+    private void OnClick(string pageTag)
+    {
+        _navigationService.NavigateTo($"/{pageTag}", this);
+    }
+
+    private void OnNavigateBack()
+    {
+        _navigationService.NavigateTo("..");
+    }
+}

src/Wpf.Ui.Demo/ViewModels/ButtonsViewModel.cs

@@ -27,9 +27,8 @@ public ButtonsViewModel(INavigationService navigationService)
         var currentTheme = testGetThemeService.GetSystemTheme();
     }
 
-
     private void OnShowMore(string parameter)
     {
-        _navigationService.Navigate(typeof(Views.Pages.Input));
+        _navigationService.NavigateTo("/input");
     }
 }

src/Wpf.Ui.Demo/ViewModels/DashboardViewModel.cs

@@ -47,19 +47,19 @@ private void OnNavigate(string parameter)
         switch (parameter)
         {
             case "navigate_to_input":
-                _navigationService.Navigate(typeof(Views.Pages.Input));
+                _navigationService.NavigateTo(typeof(Views.Pages.Input));
                 return;
 
             case "navigate_to_controls":
-                _navigationService.Navigate(typeof(Views.Pages.Controls));
+                _navigationService.NavigateTo(typeof(Views.Pages.Controls));
                 return;
 
             case "navigate_to_colors":
-                _navigationService.Navigate(typeof(Views.Pages.Colors));
+                _navigationService.NavigateTo(typeof(Views.Pages.Colors));
                 return;
 
             case "navigate_to_icons":
-                _navigationService.Navigate(typeof(Views.Pages.Icons));
+                _navigationService.NavigateTo(typeof(Views.Pages.Icons));
                 return;
         }
     }

src/Wpf.Ui.Demo/Views/Container.xaml

@@ -2,6 +2,7 @@
     x:Class="Wpf.Ui.Demo.Views.Container"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:breadcrumbDemo="clr-namespace:Wpf.Ui.Demo.Views.Pages.BreadcrumbDemo"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:demo="clr-namespace:Wpf.Ui.Demo"
     xmlns:diagnostics="clr-namespace:Wpf.Ui.Demo.Views.Diagnostics"
@@ -98,6 +99,12 @@
                         Content="Theme"
                         Icon="DarkTheme24" />
                 </ui:NavigationStore.Footer>
+                <ui:NavigationStore.HiddenItems>
+                    <ui:NavigationItem Content="Page1" PageType="{x:Type breadcrumbDemo:Page1}" />
+                    <ui:NavigationItem Content="Page2" PageType="{x:Type breadcrumbDemo:Page2}" />
+                    <ui:NavigationItem Content="Page3" PageType="{x:Type breadcrumbDemo:Page3}" />
+                    <ui:NavigationItem Content="The cake is a lie!" PageType="{x:Type pages:TMPage}" />
+                </ui:NavigationStore.HiddenItems>
             </ui:NavigationStore>
 
             <!--  We display our pages inside this element.  -->
@@ -198,8 +205,8 @@
             ForceShutdown="False"
             Icon="pack://application:,,,/Resources/wpfui.png"
             MinimizeToTray="False"
-            ShowHelp="False"
             ShowClose="True"
+            ShowHelp="False"
             ShowMaximize="True"
             ShowMinimize="True"
             UseSnapLayout="True">
@@ -237,5 +244,10 @@
                 </ui:NotifyIcon>
             </ui:TitleBar.Tray>
         </ui:TitleBar>
+
+        <!--<ui:NavigationBackButton
+            Grid.Row="0"
+            Margin="5,5,0,4"
+            Navigation="{Binding ElementName=RootNavigation, Mode=OneTime}" />-->
     </Grid>
 </ui:UiWindow>

src/Wpf.Ui.Demo/Views/Container.xaml.cs

@@ -4,6 +4,7 @@
 // All Rights Reserved.
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -96,21 +97,25 @@ public Frame GetFrame()
     public INavigation GetNavigation()
         => RootNavigation;
 
-    public bool Navigate(Type pageType)
-        => RootNavigation.Navigate(pageType);
+    public void NavigateTo(Type type, object dataContext = null)
+        => RootNavigation.NavigateTo(type, dataContext);
+
+    public void NavigateTo(string pageTag, object dataContext = null)
+        => RootNavigation.NavigateTo(pageTag, dataContext);
 
     public void SetPageService(IPageService pageService)
-        => RootNavigation.PageService = pageService;
+        => RootNavigation.SetIPageService(pageService);
 
     public void ShowWindow()
         => Show();
 
     public void CloseWindow()
         => Close();
 
+
     #endregion INavigationWindow methods
 
-    private void InvokeSplashScreen()
+    private async void InvokeSplashScreen()
     {
         if (_initialized)
             return;
@@ -122,24 +127,16 @@ private void InvokeSplashScreen()
 
         _taskBarService.SetState(this, TaskBarProgressState.Indeterminate);
 
-        Task.Run(async () =>
-        {
-            // Remember to always include Delays and Sleeps in
-            // your applications to be able to charge the client for optimizations later.
-            await Task.Delay(4000);
+        // Remember to always include Delays and Sleeps in
+        // your applications to be able to charge the client for optimizations later.
+        await Task.Delay(4000);
 
-            await Dispatcher.InvokeAsync(() =>
-            {
-                RootWelcomeGrid.Visibility = Visibility.Hidden;
-                RootMainGrid.Visibility = Visibility.Visible;
+        RootWelcomeGrid.Visibility = Visibility.Hidden;
+        RootMainGrid.Visibility = Visibility.Visible;
 
-                Navigate(typeof(Pages.Dashboard));
+        NavigateTo(typeof(Pages.Dashboard));
 
-                _taskBarService.SetState(this, TaskBarProgressState.None);
-            });
-
-            return true;
-        });
+        _taskBarService.SetState(this, TaskBarProgressState.None);
     }
 
     private void NavigationButtonTheme_OnClick(object sender, RoutedEventArgs e)
@@ -157,16 +154,15 @@ private void TrayMenuItem_OnClick(object sender, RoutedEventArgs e)
 
     private void RootNavigation_OnNavigated(INavigation sender, RoutedNavigationEventArgs e)
     {
-        System.Diagnostics.Debug.WriteLine($"DEBUG | WPF UI Navigated to: {sender?.Current ?? null}", "Wpf.Ui.Demo");
+        System.Diagnostics.Debug.WriteLine($"DEBUG | WPF UI Navigated to: {e.NavigatedTo}", "Wpf.Ui.Demo");
 
         // This funky solution allows us to impose a negative
         // margin for Frame only for the Dashboard page, thanks
         // to which the banner will cover the entire page nicely.
         RootFrame.Margin = new Thickness(
             left: 0,
-            top: sender?.Current?.PageTag == "dashboard" ? -69 : 0,
+            top: e.NavigatedTo.PageTag == "dashboard" ? -69 : 0,
             right: 0,
             bottom: 0);
     }
 }
-

src/Wpf.Ui.Demo/Views/Pages/BreadcrumbDemo/Page1.xaml

@@ -0,0 +1,25 @@
+<Page
+    x:Class="Wpf.Ui.Demo.Views.Pages.BreadcrumbDemo.Page1"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:viewModels="clr-namespace:Wpf.Ui.Demo.ViewModels"
+    Title="Page1"
+    Margin="18,18,18,0"
+    d:DataContext="{d:DesignInstance viewModels:BreadcrumbPagesViewModel}"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <StackPanel>
+        <ui:CardAction Command="{Binding Path=OnClickCommand}" CommandParameter="page2">
+            <TextBlock Text="Navigate to the second page" />
+        </ui:CardAction>
+
+        <ui:CardAction Margin="0,10,0,0" Command="{Binding Path=OnNavigateBackCommand}">
+            <TextBlock Text="Go back" />
+        </ui:CardAction>
+    </StackPanel>
+</Page>

src/Wpf.Ui.Demo/Views/Pages/BreadcrumbDemo/Page1.xaml.cs

@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Wpf.Ui.Demo.Views.Pages.BreadcrumbDemo;
+
+public partial class Page1 : Page
+{
+    public Page1()
+    {
+        InitializeComponent();
+    }
+}

src/Wpf.Ui.Demo/Views/Pages/BreadcrumbDemo/Page2.xaml

@@ -0,0 +1,25 @@
+<Page
+    x:Class="Wpf.Ui.Demo.Views.Pages.BreadcrumbDemo.Page2"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:viewModels="clr-namespace:Wpf.Ui.Demo.ViewModels"
+    Title="Page2"
+    Margin="18,18,18,0"
+    d:DataContext="{d:DesignInstance viewModels:BreadcrumbPagesViewModel}"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <StackPanel>
+        <ui:CardAction Command="{Binding Path=OnClickCommand}" CommandParameter="page3">
+            <TextBlock Text="Navigate to the third page" />
+        </ui:CardAction>
+
+        <ui:CardAction Margin="0,10,0,0" Command="{Binding Path=OnNavigateBackCommand}">
+            <TextBlock Text="Go back" />
+        </ui:CardAction>
+    </StackPanel>
+</Page>

src/Wpf.Ui.Demo/Views/Pages/BreadcrumbDemo/Page2.xaml.cs

@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Wpf.Ui.Demo.Views.Pages.BreadcrumbDemo;
+
+public partial class Page2 : Page
+{
+    public Page2()
+    {
+        InitializeComponent();
+    }
+}

src/Wpf.Ui.Demo/Views/Pages/BreadcrumbDemo/Page3.xaml

@@ -0,0 +1,25 @@
+<Page
+    x:Class="Wpf.Ui.Demo.Views.Pages.BreadcrumbDemo.Page3"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    xmlns:viewModels="clr-namespace:Wpf.Ui.Demo.ViewModels"
+    Title="Page3"
+    Margin="18,18,18,0"
+    d:DataContext="{d:DesignInstance viewModels:BreadcrumbPagesViewModel}"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <StackPanel>
+        <ui:CardAction Command="{Binding Path=OnClickCommand}" CommandParameter="the cake is a lie!">
+            <TextBlock Text="Navigate to last page" />
+        </ui:CardAction>
+
+        <ui:CardAction Margin="0,10,0,0" Command="{Binding Path=OnNavigateBackCommand}">
+            <TextBlock Text="Go back" />
+        </ui:CardAction>
+    </StackPanel>
+</Page>

src/Wpf.Ui.Demo/Views/Pages/BreadcrumbDemo/Page3.xaml.cs

@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace Wpf.Ui.Demo.Views.Pages.BreadcrumbDemo;
+
+public partial class Page3 : Page
+{
+    public Page3()
+    {
+        InitializeComponent();
+    }
+}

src/Wpf.Ui.Demo/Views/Pages/Controls.xaml

@@ -29,6 +29,7 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
             <ui:CardAction
@@ -69,7 +70,7 @@
 
             <ui:CardAction
                 Grid.Column="2"
-                Margin="4,0,0,0"
+                Margin="4,0,4,0"
                 Click="ButtonAction_OnClick"
                 Icon="CommentMultiple24"
                 Tag="messagebox">
@@ -84,6 +85,22 @@
                         Text="Opens the MessageBox." />
                 </StackPanel>
             </ui:CardAction>
+
+            <ui:CardAction
+                Grid.Column="3"
+                Margin="4,0,0,0"
+                Click="OnBreadcrumbButtonClick">
+                <StackPanel>
+                    <TextBlock
+                        FontSize="13"
+                        FontWeight="Medium"
+                        Text="Breadcrumb demo" />
+                    <TextBlock
+                        FontSize="12"
+                        Foreground="{DynamicResource TextFillColorTertiaryBrush}"
+                        Text="Try breadcrumbs." />
+                </StackPanel>
+            </ui:CardAction>
         </Grid>
 
         <TextBlock