dan/Walleby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed back nav cleanup

Browse Source
This commit is contained in:
TheXamlGuy
2024-06-10 18:11:10 +01:00
parent e538ed98f9
commit d2dd437aba
10 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wallet.Avalonia/AllNavigationView.axaml
+2 -1
View File
@@ -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>
Wallet.Avalonia/ArchiveNavigationView.axaml
+2 -1
View File
@@ -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>
Wallet.Avalonia/CategoryNavigationView.axaml
+2 -1
View File
@@ -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>
Wallet.Avalonia/CreateItemActionView.axaml
+1 -1
View File
@@ -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'}"
Wallet.Avalonia/EmptyItemCollectionView.axaml
+1 -1
View File
@@ -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'}"
Wallet.Avalonia/ItemNavigationView.axaml
+2 -1
View File
@@ -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>
Wallet.Avalonia/StarredNavigationView.axaml
+2 -1
View File
@@ -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>
Wallet.Avalonia/WalletView.axaml
+3
View File
@@ -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>
Wallet/CreateItemViewModelHandler.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using System.Xml.Linq;
using Toolkit.Foundation;
using Toolkit.Foundation;
namespace Wallet;
Wallet/ItemCollectionViewModel.cs
+1 -1
View File
@@ -11,7 +11,7 @@ public partial class ItemCollectionViewModel :
ObservableCollection<ItemNavigationViewModel>,
INotificationHandler<NotifyEventArgs<Filter>>,
INotificationHandler<NotifyEventArgs<Search<string>>>,
IBackStack
INavigationBackStack
{
[ObservableProperty]
public string? named;