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

Some refactoring

Browse Source
This commit is contained in:
TheXamlGuy
2024-06-09 22:41:58 +01:00
parent b5f125546f
commit be6924f49e
37 changed files with 204 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wallet.Avalonia/AllNavigationView.axaml
+1 -1
View File
@@ -24,7 +24,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Left" Route="ContentItemCollection">
<NavigateAction Region="Left" Route="ItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
<Parameter Key="Transition" Value="FromRight" />
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
Wallet.Avalonia/App.axaml.cs
+6 -3
View File
@@ -120,12 +120,12 @@ public partial class App : Application
services.AddTemplate<OpenWalletViewModel, OpenWalletView>("OpenWallet");
services.AddScoped<WalletViewModelConfiguration>();
services.AddScoped<ItemCollectionConfiguration>();
services.AddTemplate<WalletViewModel, WalletView>("Wallet");
services.AddTemplate<ItemCollectionViewModel, ItemCollectionView>("ContentItemCollection");
services.AddTemplate<ItemCollectionViewModel, ItemCollectionView>("ItemCollection");
services.AddHandler<SynchronizeItemViewModelHandler>();
services.AddHandler<SynchronizeItemCollectionViewModelHandler>();
services.AddTemplate<WalletHeaderViewModel, WalletHeaderView>("WalletHeader");
services.AddTemplate<BackActionViewModel, BackActionView>();
@@ -146,9 +146,12 @@ public partial class App : Application
services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
services.AddTemplate<EmptyItemCollectionViewModel, EmptyItemCollectionView>("EmptyItemCollection");
services.AddScoped<IDecoratorService<ItemHeaderConfiguration>, DecoratorService<ItemHeaderConfiguration>>();
services.AddScoped<IDecoratorService<ItemConfiguration>, DecoratorService<ItemConfiguration>>();
services.AddTemplate<ItemViewModel, ItemView>("Item");
services.AddHandler<CreateItemViewModelHandler>("Item");
services.AddTemplate<ItemHeaderViewModel, ItemHeaderView>();
services.AddTemplate<ItemContentViewModel, ItemContentView>();
Wallet.Avalonia/ArchiveNavigationView.axaml
+1 -1
View File
@@ -24,7 +24,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Left" Route="ContentItemCollection">
<NavigateAction Region="Left" Route="ItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
<Parameter Key="Transition" Value="FromRight" />
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
Wallet.Avalonia/CategoriesNavigationView.axaml
+2 -1
View File
@@ -5,4 +5,5 @@
xmlns:vm="using:Wallet"
x:DataType="vm:CategoriesNavigationViewModel"
Content="Categories"
MenuItemsSource="{Binding}" />
MenuItemsSource="{Binding}"
SelectsOnInvoked="False" />
Wallet.Avalonia/CategoryNavigationView.axaml
+29 -1
View File
@@ -4,4 +4,32 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Wallet"
x:DataType="vm:CategoryNavigationViewModel"
Content="{Binding Filter}" />
Content="{Binding Filter}"
IsSelected="{Binding Selected}">
<Interaction.Behaviors>
<DataTriggerBehavior Binding="{Binding Selected}" Value="True">
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Wallet">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
<ConditionAction>
<ConditionAction.Condition>
<ConditionalExpression ForwardChaining="And">
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Left" Route="ItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
<Parameter Key="Transition" Value="FromRight" />
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
</NavigateAction>
</ConditionAction>
</DataTriggerBehavior>
</Interaction.Behaviors>
</NavigationViewItem>
Wallet.Avalonia/ItemNavigationView.axaml
+2 -2
View File
@@ -14,11 +14,11 @@
Region="{Binding Named, StringFormat='{}{0}:Content'}"
Route="Item"
Scope="self">
<Parameter Key="FromCategory" Value="{x:False}" />
<Parameter Key="State" Value="{x:Static vm:ItemState.Read}" />
<Parameter Key="Name" Value="{Binding Name}" />
<Parameter Key="FromCategory" Value="{x:False}" />
<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}" />
</NavigateAction>
</AttachedEventTriggerBehaviour>
Wallet.Avalonia/StarredNavigationView.axaml
+1 -1
View File
@@ -24,7 +24,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Left" Route="ContentItemCollection">
<NavigateAction Region="Left" Route="ItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
<Parameter Key="Transition" Value="FromRight" />
<Parameter Key="NavigationStackEnabled" Value="{x:True}" />
Wallet.Avalonia/WalletView.axaml
+1 -1
View File
@@ -26,7 +26,7 @@
<Interaction.Behaviors>
<AttachedBehaviour>
<NavigateRegionAction Name="Left">
<NavigateAction Region="Left" Route="ContentItemCollection">
<NavigateAction Region="Left" Route="ItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</NavigateRegionAction>