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

Fixes

Browse Source
This commit is contained in:
TheXamlGuy
2024-06-16 17:25:13 +01:00
parent 6405e0c7c6
commit 5653d9b41e
31 changed files with 78 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wallet.Avalonia/AllNavigationView.axaml
+2 -2
View File
@@ -5,9 +5,9 @@
xmlns:vm="using:Wallet"
x:DataType="vm:AllNavigationViewModel"
Content="All"
IsSelected="{Binding Selected}">
IsSelected="{Binding IsSelected}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<DataTriggerBehavior Binding="{Binding IsSelected}" Value="True">
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
Wallet.Avalonia/ArchiveNavigationView.axaml
+2 -2
View File
@@ -5,9 +5,9 @@
xmlns:vm="using:Wallet"
x:DataType="vm:ArchiveNavigationViewModel"
Content="Archive"
IsSelected="{Binding Selected, Mode=TwoWay}">
IsSelected="{Binding IsSelected}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<DataTriggerBehavior Binding="{Binding IsSelected}" Value="True">
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
Wallet.Avalonia/ArchiveNavigationView.axaml.cs
+4 -2
View File
@@ -2,7 +2,9 @@ using Toolkit.UI.Controls.Avalonia;
namespace Wallet.Avalonia;
public partial class ArchiveNavigationView : NavigationViewItem
public partial class ArchiveNavigationView :
NavigationViewItem
{
public ArchiveNavigationView() => InitializeComponent();
public ArchiveNavigationView() =>
InitializeComponent();
}
Wallet.Avalonia/CategoryNavigationView.axaml
+4 -4
View File
@@ -5,13 +5,13 @@
xmlns:vm="using:Wallet"
x:DataType="vm:CategoryNavigationViewModel"
Content="{Binding Value}"
IsSelected="{Binding Selected}">
IsSelected="{Binding IsSelected}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<DataTriggerBehavior Binding="{Binding IsSelected}" Value="True">
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
<ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Wallet">
@@ -21,7 +21,7 @@
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Left" Route="ItemCollection">
Wallet.Avalonia/FavouritesNavigationView.axaml
+4 -4
View File
@@ -5,13 +5,13 @@
xmlns:vm="using:Wallet"
x:DataType="vm:FavouritesNavigationViewModel"
Content="Favourites"
IsSelected="{Binding Selected, Mode=TwoWay}">
IsSelected="{Binding IsSelected}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<DataTriggerBehavior Binding="{Binding IsSelected}" Value="True">
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
<ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Wallet">
@@ -21,7 +21,7 @@
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Left" Route="ItemCollection">
Wallet.Avalonia/MainView.axaml
+1 -1
View File
@@ -6,9 +6,9 @@
x:DataType="vm:MainViewModel">
<NavigationView
FooterMenuItemsSource="{Binding Footer}"
IsSettingsVisible="False"
MenuItemTemplate="{Binding Template}"
MenuItemsSource="{Binding}"
IsSettingsVisible="False"
SelectedItem="{Binding SelectedItem}"
SelectionFollowsFocus="True">
<NavigationView.Resources>
Wallet.Avalonia/WalletNavigationView.axaml
+13 -13
View File
@@ -7,17 +7,17 @@
x:Name="NavigationViewItem"
x:DataType="vm:WalletNavigationViewModel"
Content="{Binding Name}"
IsExpanded="{Binding Expanded}"
IsSelected="{Binding Selected}"
IsExpanded="{Binding IsExpanded}"
IsSelected="{Binding IsSelected}"
MenuItemsSource="{Binding}"
NavigationViewExtension.IsItemInvokedEnabled="True"
SelectsOnInvoked="True">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Opened}" Value="False">
<DataTriggerBehavior Binding="{Binding IsOpened}" Value="False">
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsSelected}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="OpenWallet">
@@ -29,11 +29,11 @@
Value="True" />
</ConditionAction>
</DataTriggerBehavior>
<DataTriggerBehavior Binding="{Binding Opened}" Value="True">
<DataTriggerBehavior Binding="{Binding IsOpened}" Value="True">
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsSelected}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<ChangePropertyAction
@@ -47,8 +47,8 @@
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
<ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="False" />
<ComparisonCondition LeftOperand="{Binding IsSelected}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="OpenWallet">
@@ -58,7 +58,7 @@
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
@@ -70,7 +70,7 @@
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
<ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="OpenWallet">
@@ -80,18 +80,18 @@
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="True" />
<ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<InvokeNavigationViewItemAction />
</ConditionAction>
</AttachedEventTriggerBehaviour>
<DataTriggerBehavior Binding="{Binding Opened}" Value="False">
<DataTriggerBehavior Binding="{Binding IsOpened}" Value="False">
<RemoveClassAction ClassName="Closed" />
<AddClassAction ClassName="Closed" RemoveIfExists="True" />
</DataTriggerBehavior>
<DataTriggerBehavior Binding="{Binding Opened}" Value="True">
<DataTriggerBehavior Binding="{Binding IsOpened}" Value="True">
<RemoveClassAction ClassName="Opened" />
<AddClassAction ClassName="Opened" RemoveIfExists="True" />
</DataTriggerBehavior>