From d2dd437aba96216d7b89b4274ae59de7ee711ccb Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Mon, 10 Jun 2024 18:11:10 +0100
Subject: [PATCH] Fixed back nav cleanup

---
 Wallet.Avalonia/AllNavigationView.axaml       | 3 ++-
 Wallet.Avalonia/ArchiveNavigationView.axaml   | 3 ++-
 Wallet.Avalonia/CategoryNavigationView.axaml  | 3 ++-
 Wallet.Avalonia/CreateItemActionView.axaml    | 2 +-
 Wallet.Avalonia/EmptyItemCollectionView.axaml | 2 +-
 Wallet.Avalonia/ItemNavigationView.axaml      | 3 ++-
 Wallet.Avalonia/StarredNavigationView.axaml   | 3 ++-
 Wallet.Avalonia/WalletView.axaml              | 3 +++
 Wallet/CreateItemViewModelHandler.cs          | 3 +--
 Wallet/ItemCollectionViewModel.cs             | 2 +-
 10 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Wallet.Avalonia/AllNavigationView.axaml b/Wallet.Avalonia/AllNavigationView.axaml
index 01a4060..6ead957 100644
--- a/Wallet.Avalonia/AllNavigationView.axaml
+++ b/Wallet.Avalonia/AllNavigationView.axaml
@@ -27,7 +27,8 @@
                 <NavigateAction Region="Left" Route="ItemCollection">
                     <Parameter Key="Filter" Value="{Binding Filter}" />
                     <Parameter Key="Transition" Value="FromRight" />
-                    <Parameter Key="NavigationStackEnabled" Value="{x:True}" />
+                    <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
+                    <Parameter Key="ClearBackStack" Value="{x:True}" />
                 </NavigateAction>
             </ConditionAction>
         </DataTriggerBehavior>
diff --git a/Wallet.Avalonia/ArchiveNavigationView.axaml b/Wallet.Avalonia/ArchiveNavigationView.axaml
index 2e1d431..549b3a1 100644
--- a/Wallet.Avalonia/ArchiveNavigationView.axaml
+++ b/Wallet.Avalonia/ArchiveNavigationView.axaml
@@ -27,7 +27,8 @@
                 <NavigateAction Region="Left" Route="ItemCollection">
                     <Parameter Key="Filter" Value="{Binding Filter}" />
                     <Parameter Key="Transition" Value="FromRight" />
-                    <Parameter Key="NavigationStackEnabled" Value="{x:True}" />
+                    <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
+                    <Parameter Key="ClearBackStack" Value="{x:True}" />
                 </NavigateAction>
             </ConditionAction>
         </DataTriggerBehavior>
diff --git a/Wallet.Avalonia/CategoryNavigationView.axaml b/Wallet.Avalonia/CategoryNavigationView.axaml
index 9b5efcf..4865dfd 100644
--- a/Wallet.Avalonia/CategoryNavigationView.axaml
+++ b/Wallet.Avalonia/CategoryNavigationView.axaml
@@ -27,7 +27,8 @@
                 <NavigateAction Region="Left" Route="ItemCollection">
                     <Parameter Key="Filter" Value="{Binding Filter}" />
                     <Parameter Key="Transition" Value="FromRight" />
-                    <Parameter Key="NavigationStackEnabled" Value="{x:True}" />
+                    <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
+                    <Parameter Key="ClearBackStack" Value="{x:True}" />
                 </NavigateAction>
             </ConditionAction>
         </DataTriggerBehavior>
diff --git a/Wallet.Avalonia/CreateItemActionView.axaml b/Wallet.Avalonia/CreateItemActionView.axaml
index f1d57ff..81609d4 100644
--- a/Wallet.Avalonia/CreateItemActionView.axaml
+++ b/Wallet.Avalonia/CreateItemActionView.axaml
@@ -30,7 +30,7 @@
             <EventTriggerBehavior EventName="Click">
                 <NavigateAction Region="Left" Route="ItemCategoryCollection">
                     <Parameter Key="Transition" Value="FromRight" />
-                    <Parameter Key="NavigationStackEnabled" Value="{x:True}" />
+                    <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
                 </NavigateAction>
                 <NavigateAction
                     Region="{Binding Named, StringFormat='{}{0}:Content'}"
diff --git a/Wallet.Avalonia/EmptyItemCollectionView.axaml b/Wallet.Avalonia/EmptyItemCollectionView.axaml
index 823709a..29bdf2b 100644
--- a/Wallet.Avalonia/EmptyItemCollectionView.axaml
+++ b/Wallet.Avalonia/EmptyItemCollectionView.axaml
@@ -14,7 +14,7 @@
                 <EventTriggerBehavior EventName="Click">
                     <NavigateAction Region="Left" Route="ItemCategoryCollection">
                         <Parameter Key="Transition" Value="FromRight" />
-                        <Parameter Key="NavigationStackEnabled" Value="{x:True}" />
+                        <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
                     </NavigateAction>
                     <NavigateAction
                         Region="{Binding Named, StringFormat='{}{0}:Content'}"
diff --git a/Wallet.Avalonia/ItemNavigationView.axaml b/Wallet.Avalonia/ItemNavigationView.axaml
index 0289e25..927abfa 100644
--- a/Wallet.Avalonia/ItemNavigationView.axaml
+++ b/Wallet.Avalonia/ItemNavigationView.axaml
@@ -19,7 +19,8 @@
                 <Parameter Key="Favourite" Value="{Binding Favourite}" />
                 <Parameter Key="Archived" Value="{Binding Archived}" />
                 <Parameter Key="State" Value="{x:Static vm:ItemState.Read}" />
-                <Parameter Key="NavigationStackEnabled" Value="{x:False}" />
+                <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
+                <Parameter Key="ClearBackStack" Value="{x:True}" />
             </NavigateAction>
         </AttachedEventTriggerBehaviour>
     </Interaction.Behaviors>
diff --git a/Wallet.Avalonia/StarredNavigationView.axaml b/Wallet.Avalonia/StarredNavigationView.axaml
index 3525dc0..7365659 100644
--- a/Wallet.Avalonia/StarredNavigationView.axaml
+++ b/Wallet.Avalonia/StarredNavigationView.axaml
@@ -27,7 +27,8 @@
                 <NavigateAction Region="Left" Route="ItemCollection">
                     <Parameter Key="Filter" Value="{Binding Filter}" />
                     <Parameter Key="Transition" Value="FromRight" />
-                    <Parameter Key="NavigationStackEnabled" Value="{x:True}" />
+                    <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
+                    <Parameter Key="ClearBackStack" Value="{x:True}" />
                 </NavigateAction>
             </ConditionAction>
         </DataTriggerBehavior>
diff --git a/Wallet.Avalonia/WalletView.axaml b/Wallet.Avalonia/WalletView.axaml
index f6e7dcd..b4a59be 100644
--- a/Wallet.Avalonia/WalletView.axaml
+++ b/Wallet.Avalonia/WalletView.axaml
@@ -28,6 +28,9 @@
                     <NavigateRegionAction Name="Left">
                         <NavigateAction Region="Left" Route="ItemCollection">
                             <Parameter Key="Filter" Value="{Binding Filter}" />
+                            <Parameter Key="Transition" Value="FromRight" />
+                            <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
+                            <Parameter Key="ClearBackStack" Value="{x:True}" />
                         </NavigateAction>
                     </NavigateRegionAction>
                 </AttachedBehaviour>
diff --git a/Wallet/CreateItemViewModelHandler.cs b/Wallet/CreateItemViewModelHandler.cs
index 78a0b0d..2373fc7 100644
--- a/Wallet/CreateItemViewModelHandler.cs
+++ b/Wallet/CreateItemViewModelHandler.cs
@@ -1,5 +1,4 @@
-using System.Xml.Linq;
-using Toolkit.Foundation;
+using Toolkit.Foundation;
 
 namespace Wallet;
 
diff --git a/Wallet/ItemCollectionViewModel.cs b/Wallet/ItemCollectionViewModel.cs
index 84ae3a1..a1e38ff 100644
--- a/Wallet/ItemCollectionViewModel.cs
+++ b/Wallet/ItemCollectionViewModel.cs
@@ -11,7 +11,7 @@ public partial class ItemCollectionViewModel :
     ObservableCollection<ItemNavigationViewModel>,
     INotificationHandler<NotifyEventArgs<Filter>>,
     INotificationHandler<NotifyEventArgs<Search<string>>>,
-    IBackStack
+    INavigationBackStack
 {
     [ObservableProperty]
     public string? named;