Improve navigation
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
|
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
|
||||||
</ConditionalExpression>
|
</ConditionalExpression>
|
||||||
</ConditionAction.Condition>
|
</ConditionAction.Condition>
|
||||||
<NavigateAction Context="Main" Route="Container">
|
<NavigateAction Region="Main" Route="Container">
|
||||||
<NavigateAction.ParameterBindings>
|
<NavigateAction.ParameterBindings>
|
||||||
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
|
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
|
||||||
</NavigateAction.ParameterBindings>
|
</NavigateAction.ParameterBindings>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
|
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
|
||||||
</ConditionalExpression>
|
</ConditionalExpression>
|
||||||
</ConditionAction.Condition>
|
</ConditionAction.Condition>
|
||||||
<NavigateAction Context="Main" Route="Vault">
|
<NavigateAction Region="Main" Route="Vault">
|
||||||
<NavigateAction.ParameterBindings>
|
<NavigateAction.ParameterBindings>
|
||||||
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
|
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
|
||||||
</NavigateAction.ParameterBindings>
|
</NavigateAction.ParameterBindings>
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
<ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
|
<ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
|
||||||
</ConditionalExpression>
|
</ConditionalExpression>
|
||||||
</ConditionAction.Condition>
|
</ConditionAction.Condition>
|
||||||
<NavigateAction Context="Main" Route="OpenContainer" />
|
<NavigateAction Region="Main" Route="OpenContainer" />
|
||||||
<ChangePropertyAction
|
<ChangePropertyAction
|
||||||
PropertyName="SelectsOnInvoked"
|
PropertyName="SelectsOnInvoked"
|
||||||
TargetObject="{Binding #NavigationViewItem}"
|
TargetObject="{Binding #NavigationViewItem}"
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
|
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
|
||||||
</ConditionalExpression>
|
</ConditionalExpression>
|
||||||
</ConditionAction.Condition>
|
</ConditionAction.Condition>
|
||||||
<NavigateAction Context="Main" Route="OpenContainer" />
|
<NavigateAction Region="Main" Route="OpenContainer" />
|
||||||
</ConditionAction>
|
</ConditionAction>
|
||||||
<ConditionAction>
|
<ConditionAction>
|
||||||
<ConditionAction.Condition>
|
<ConditionAction.Condition>
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
|
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
|
||||||
</ConditionalExpression>
|
</ConditionalExpression>
|
||||||
</ConditionAction.Condition>
|
</ConditionAction.Condition>
|
||||||
<NavigateAction Context="Main" Route="Container" />
|
<NavigateAction Region="Main" Route="Container" />
|
||||||
<InvokeNavigationViewItemAction />
|
<InvokeNavigationViewItemAction />
|
||||||
</ConditionAction>
|
</ConditionAction>
|
||||||
</AttachedEventTriggerBehaviour>
|
</AttachedEventTriggerBehaviour>
|
||||||
|
|||||||
@@ -11,9 +11,9 @@
|
|||||||
Height="40"
|
Height="40"
|
||||||
Margin="4,4,0,0">
|
Margin="4,4,0,0">
|
||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="Loaded">
|
<AttachedBehaviour>
|
||||||
<NavigateAction Context="{Binding $self}" Route="ContainerHeader" />
|
<NavigateAction Region="{Binding $self}" Route="ContainerHeader" />
|
||||||
</EventTriggerBehavior>
|
</AttachedBehaviour>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
</ContentControl>
|
</ContentControl>
|
||||||
<ListBox
|
<ListBox
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<Button MinWidth="132" Content="Create vault">
|
<Button MinWidth="132" Content="Create vault">
|
||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="Click">
|
<EventTriggerBehavior EventName="Click">
|
||||||
<NavigateAction Route="CreateContainer" />
|
<NavigateAction Region="self" Route="CreateContainer" />
|
||||||
</EventTriggerBehavior>
|
</EventTriggerBehavior>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -16,11 +16,11 @@
|
|||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="Click">
|
<EventTriggerBehavior EventName="Click">
|
||||||
<NavigateAction
|
<NavigateAction
|
||||||
Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
|
Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
|
||||||
Route="ItemCommandHeader"
|
Route="ItemCommandHeader"
|
||||||
Scope="self" />
|
Scope="self" />
|
||||||
<NavigateAction
|
<NavigateAction
|
||||||
Context="{Binding Named, StringFormat='{}{0}:Content'}"
|
Region="{Binding Named, StringFormat='{}{0}:Content'}"
|
||||||
Route="Item"
|
Route="Item"
|
||||||
Scope="self">
|
Scope="self">
|
||||||
<NavigateAction.ParameterBindings>
|
<NavigateAction.ParameterBindings>
|
||||||
|
|||||||
@@ -8,11 +8,11 @@
|
|||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
|
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
|
||||||
<NavigateAction
|
<NavigateAction
|
||||||
Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
|
Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
|
||||||
Route="ItemCommandHeader"
|
Route="ItemCommandHeader"
|
||||||
Scope="self" />
|
Scope="self" />
|
||||||
<NavigateAction
|
<NavigateAction
|
||||||
Context="{Binding Named, StringFormat='{}{0}:Content'}"
|
Region="{Binding Named, StringFormat='{}{0}:Content'}"
|
||||||
Route="Item"
|
Route="Item"
|
||||||
Scope="self">
|
Scope="self">
|
||||||
<NavigateAction.ParameterBindings>
|
<NavigateAction.ParameterBindings>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="Loaded">
|
<EventTriggerBehavior EventName="Loaded">
|
||||||
<NavigateRegionAction Name="Main">
|
<NavigateRegionAction Name="Main">
|
||||||
<NavigateAction Context="Main" Route="Container" />
|
<NavigateAction Region="Main" Route="Container" />
|
||||||
</NavigateRegionAction>
|
</NavigateRegionAction>
|
||||||
</EventTriggerBehavior>
|
</EventTriggerBehavior>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<AttachedBehaviour>
|
<AttachedBehaviour>
|
||||||
<NavigateRegionAction Name="Window">
|
<NavigateRegionAction Name="Window">
|
||||||
<NavigateAction Context="Window" Route="Main" />
|
<NavigateAction Region="Window" Route="Main" />
|
||||||
</NavigateRegionAction>
|
</NavigateRegionAction>
|
||||||
</AttachedBehaviour>
|
</AttachedBehaviour>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
Content="Manage Vaults">
|
Content="Manage Vaults">
|
||||||
<Interaction.Behaviors>
|
<Interaction.Behaviors>
|
||||||
<EventTriggerBehavior EventName="Tapped">
|
<EventTriggerBehavior EventName="Tapped">
|
||||||
<NavigateAction Context="Main" Route="Manage" />
|
<NavigateAction Region="Main" Route="Manage" />
|
||||||
</EventTriggerBehavior>
|
</EventTriggerBehavior>
|
||||||
</Interaction.Behaviors>
|
</Interaction.Behaviors>
|
||||||
</NavigationViewItem>
|
</NavigationViewItem>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
|
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
|
||||||
</ConditionalExpression>
|
</ConditionalExpression>
|
||||||
</ConditionAction.Condition>
|
</ConditionAction.Condition>
|
||||||
<NavigateAction Context="Main" Route="Vault">
|
<NavigateAction Region="Main" Route="Vault">
|
||||||
<NavigateAction.ParameterBindings>
|
<NavigateAction.ParameterBindings>
|
||||||
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
|
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
|
||||||
</NavigateAction.ParameterBindings>
|
</NavigateAction.ParameterBindings>
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ public partial class ItemViewModel :
|
|||||||
ISubscription subscriber,
|
ISubscription subscriber,
|
||||||
IDisposer disposer,
|
IDisposer disposer,
|
||||||
IContentTemplate template,
|
IContentTemplate template,
|
||||||
IValueStore<Item> foom,
|
|
||||||
bool immutable = true,
|
bool immutable = true,
|
||||||
int? id = null,
|
int? id = null,
|
||||||
string? name = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
|
string? name = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
|
||||||
|
|||||||
Reference in New Issue
Block a user