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

Improve navigation

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-16 22:30:01 +01:00
parent fdf1386b6a
commit 5993876340
12 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bitvault.Avalonia/AllNavigationView.axaml
+1 -1
View File
@@ -14,7 +14,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="Container">
<NavigateAction Region="Main" Route="Container">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
</NavigateAction.ParameterBindings>
Bitvault.Avalonia/ArchiveNavigationView.axaml
+1 -1
View File
@@ -14,7 +14,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="Vault">
<NavigateAction Region="Main" Route="Vault">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
</NavigateAction.ParameterBindings>
Bitvault.Avalonia/ContainerNavigationView.axaml
+3 -3
View File
@@ -19,7 +19,7 @@
<ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="OpenContainer" />
<NavigateAction Region="Main" Route="OpenContainer" />
<ChangePropertyAction
PropertyName="SelectsOnInvoked"
TargetObject="{Binding #NavigationViewItem}"
@@ -47,7 +47,7 @@
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="OpenContainer" />
<NavigateAction Region="Main" Route="OpenContainer" />
</ConditionAction>
<ConditionAction>
<ConditionAction.Condition>
@@ -56,7 +56,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="Container" />
<NavigateAction Region="Main" Route="Container" />
<InvokeNavigationViewItemAction />
</ConditionAction>
</AttachedEventTriggerBehaviour>
Bitvault.Avalonia/ContainerView.axaml
+3 -3
View File
@@ -11,9 +11,9 @@
Height="40"
Margin="4,4,0,0">
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Loaded">
<NavigateAction Context="{Binding $self}" Route="ContainerHeader" />
</EventTriggerBehavior>
<AttachedBehaviour>
<NavigateAction Region="{Binding $self}" Route="ContainerHeader" />
</AttachedBehaviour>
</Interaction.Behaviors>
</ContentControl>
<ListBox
Bitvault.Avalonia/CreateContainerNavigationView.axaml
+1 -1
View File
@@ -8,7 +8,7 @@
<Button MinWidth="132" Content="Create vault">
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Click">
<NavigateAction Route="CreateContainer" />
<NavigateAction Region="self" Route="CreateContainer" />
</EventTriggerBehavior>
</Interaction.Behaviors>
</Button>
Bitvault.Avalonia/CreateItemActionView.axaml
+2 -2
View File
@@ -16,11 +16,11 @@
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Click">
<NavigateAction
Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
Route="ItemCommandHeader"
Scope="self" />
<NavigateAction
Context="{Binding Named, StringFormat='{}{0}:Content'}"
Region="{Binding Named, StringFormat='{}{0}:Content'}"
Route="Item"
Scope="self">
<NavigateAction.ParameterBindings>
Bitvault.Avalonia/ItemNavigationView.axaml
+2 -2
View File
@@ -8,11 +8,11 @@
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<NavigateAction
Context="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
Route="ItemCommandHeader"
Scope="self" />
<NavigateAction
Context="{Binding Named, StringFormat='{}{0}:Content'}"
Region="{Binding Named, StringFormat='{}{0}:Content'}"
Route="Item"
Scope="self">
<NavigateAction.ParameterBindings>
Bitvault.Avalonia/MainView.axaml
+1 -1
View File
@@ -16,7 +16,7 @@
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Loaded">
<NavigateRegionAction Name="Main">
<NavigateAction Context="Main" Route="Container" />
<NavigateAction Region="Main" Route="Container" />
</NavigateRegionAction>
</EventTriggerBehavior>
</Interaction.Behaviors>
Bitvault.Avalonia/MainWindow.axaml
+1 -1
View File
@@ -11,7 +11,7 @@
<Interaction.Behaviors>
<AttachedBehaviour>
<NavigateRegionAction Name="Window">
<NavigateAction Context="Window" Route="Main" />
<NavigateAction Region="Window" Route="Main" />
</NavigateRegionAction>
</AttachedBehaviour>
</Interaction.Behaviors>
Bitvault.Avalonia/ManageNavigationView.axaml
+1 -1
View File
@@ -5,7 +5,7 @@
Content="Manage Vaults">
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Tapped">
<NavigateAction Context="Main" Route="Manage" />
<NavigateAction Region="Main" Route="Manage" />
</EventTriggerBehavior>
</Interaction.Behaviors>
</NavigationViewItem>
Bitvault.Avalonia/StarredNavigationView.axaml
+1 -1
View File
@@ -14,7 +14,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Context="Main" Route="Vault">
<NavigateAction Region="Main" Route="Vault">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
</NavigateAction.ParameterBindings>
Bitvault/ItemViewModel.cs
-1
View File
@@ -19,7 +19,6 @@ public partial class ItemViewModel :
ISubscription subscriber,
IDisposer disposer,
IContentTemplate template,
IValueStore<Item> foom,
bool immutable = true,
int? id = null,
string? name = null) : base(provider, factory, mediator, publisher, subscriber, disposer)