Fixed back nav cleanup
This commit is contained in:
@@ -27,7 +27,8 @@
|
|||||||
<NavigateAction Region="Left" Route="ItemCollection">
|
<NavigateAction Region="Left" Route="ItemCollection">
|
||||||
<Parameter Key="Filter" Value="{Binding Filter}" />
|
<Parameter Key="Filter" Value="{Binding Filter}" />
|
||||||
<Parameter Key="Transition" Value="FromRight" />
|
<Parameter Key="Transition" Value="FromRight" />
|
||||||
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
|
<Parameter Key="IsBackStackEnabled" Value="{x:True}" />
|
||||||
|
<Parameter Key="ClearBackStack" Value="{x:True}" />
|
||||||
</NavigateAction>
|
</NavigateAction>
|
||||||
</ConditionAction>
|
</ConditionAction>
|
||||||
</DataTriggerBehavior>
|
</DataTriggerBehavior>
|
||||||
|
|||||||
@@ -27,7 +27,8 @@
|
|||||||
<NavigateAction Region="Left" Route="ItemCollection">
|
<NavigateAction Region="Left" Route="ItemCollection">
|
||||||
<Parameter Key="Filter" Value="{Binding Filter}" />
|
<Parameter Key="Filter" Value="{Binding Filter}" />
|
||||||
<Parameter Key="Transition" Value="FromRight" />
|
<Parameter Key="Transition" Value="FromRight" />
|
||||||
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
|
<Parameter Key="IsBackStackEnabled" Value="{x:True}" />
|
||||||
|
<Parameter Key="ClearBackStack" Value="{x:True}" />
|
||||||
</NavigateAction>
|
</NavigateAction>
|
||||||
</ConditionAction>
|
</ConditionAction>
|
||||||
</DataTriggerBehavior>
|
</DataTriggerBehavior>
|
||||||
|
|||||||
@@ -27,7 +27,8 @@
|
|||||||
<NavigateAction Region="Left" Route="ItemCollection">
|
<NavigateAction Region="Left" Route="ItemCollection">
|
||||||
<Parameter Key="Filter" Value="{Binding Filter}" />
|
<Parameter Key="Filter" Value="{Binding Filter}" />
|
||||||
<Parameter Key="Transition" Value="FromRight" />
|
<Parameter Key="Transition" Value="FromRight" />
|
||||||
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
|
<Parameter Key="IsBackStackEnabled" Value="{x:True}" />
|
||||||
|
<Parameter Key="ClearBackStack" Value="{x:True}" />
|
||||||
</NavigateAction>
|
</NavigateAction>
|
||||||
</ConditionAction>
|
</ConditionAction>
|
||||||
</DataTriggerBehavior>
|
</DataTriggerBehavior>
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
<EventTriggerBehavior EventName="Click">
|
<EventTriggerBehavior EventName="Click">
|
||||||
<NavigateAction Region="Left" Route="ItemCategoryCollection">
|
<NavigateAction Region="Left" Route="ItemCategoryCollection">
|
||||||
<Parameter Key="Transition" Value="FromRight" />
|
<Parameter Key="Transition" Value="FromRight" />
|
||||||
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
|
<Parameter Key="IsBackStackEnabled" Value="{x:True}" />
|
||||||
</NavigateAction>
|
</NavigateAction>
|
||||||
<NavigateAction
|
<NavigateAction
|
||||||
Region="{Binding Named, StringFormat='{}{0}:Content'}"
|
Region="{Binding Named, StringFormat='{}{0}:Content'}"
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<EventTriggerBehavior EventName="Click">
|
<EventTriggerBehavior EventName="Click">
|
||||||
<NavigateAction Region="Left" Route="ItemCategoryCollection">
|
<NavigateAction Region="Left" Route="ItemCategoryCollection">
|
||||||
<Parameter Key="Transition" Value="FromRight" />
|
<Parameter Key="Transition" Value="FromRight" />
|
||||||
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
|
<Parameter Key="IsBackStackEnabled" Value="{x:True}" />
|
||||||
</NavigateAction>
|
</NavigateAction>
|
||||||
<NavigateAction
|
<NavigateAction
|
||||||
Region="{Binding Named, StringFormat='{}{0}:Content'}"
|
Region="{Binding Named, StringFormat='{}{0}:Content'}"
|
||||||
|
|||||||
@@ -19,7 +19,8 @@
|
|||||||
<Parameter Key="Favourite" Value="{Binding Favourite}" />
|
<Parameter Key="Favourite" Value="{Binding Favourite}" />
|
||||||
<Parameter Key="Archived" Value="{Binding Archived}" />
|
<Parameter Key="Archived" Value="{Binding Archived}" />
|
||||||
<Parameter Key="State" Value="{x:Static vm:ItemState.Read}" />
|
<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>
|
</NavigateAction>
|
||||||
</AttachedEventTriggerBehaviour>
|
</AttachedEventTriggerBehaviour>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
|
|||||||
@@ -27,7 +27,8 @@
|
|||||||
<NavigateAction Region="Left" Route="ItemCollection">
|
<NavigateAction Region="Left" Route="ItemCollection">
|
||||||
<Parameter Key="Filter" Value="{Binding Filter}" />
|
<Parameter Key="Filter" Value="{Binding Filter}" />
|
||||||
<Parameter Key="Transition" Value="FromRight" />
|
<Parameter Key="Transition" Value="FromRight" />
|
||||||
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
|
<Parameter Key="IsBackStackEnabled" Value="{x:True}" />
|
||||||
|
<Parameter Key="ClearBackStack" Value="{x:True}" />
|
||||||
</NavigateAction>
|
</NavigateAction>
|
||||||
</ConditionAction>
|
</ConditionAction>
|
||||||
</DataTriggerBehavior>
|
</DataTriggerBehavior>
|
||||||
|
|||||||
@@ -28,6 +28,9 @@
|
|||||||
<NavigateRegionAction Name="Left">
|
<NavigateRegionAction Name="Left">
|
||||||
<NavigateAction Region="Left" Route="ItemCollection">
|
<NavigateAction Region="Left" Route="ItemCollection">
|
||||||
<Parameter Key="Filter" Value="{Binding Filter}" />
|
<Parameter Key="Filter" Value="{Binding Filter}" />
|
||||||
|
<Parameter Key="Transition" Value="FromRight" />
|
||||||
|
<Parameter Key="IsBackStackEnabled" Value="{x:True}" />
|
||||||
|
<Parameter Key="ClearBackStack" Value="{x:True}" />
|
||||||
</NavigateAction>
|
</NavigateAction>
|
||||||
</NavigateRegionAction>
|
</NavigateRegionAction>
|
||||||
</AttachedBehaviour>
|
</AttachedBehaviour>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using System.Xml.Linq;
|
using Toolkit.Foundation;
|
||||||
using Toolkit.Foundation;
|
|
||||||
|
|
||||||
namespace Wallet;
|
namespace Wallet;
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ public partial class ItemCollectionViewModel :
|
|||||||
ObservableCollection<ItemNavigationViewModel>,
|
ObservableCollection<ItemNavigationViewModel>,
|
||||||
INotificationHandler<NotifyEventArgs<Filter>>,
|
INotificationHandler<NotifyEventArgs<Filter>>,
|
||||||
INotificationHandler<NotifyEventArgs<Search<string>>>,
|
INotificationHandler<NotifyEventArgs<Search<string>>>,
|
||||||
IBackStack
|
INavigationBackStack
|
||||||
{
|
{
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public string? named;
|
public string? named;
|
||||||
|
|||||||
Reference in New Issue
Block a user