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

Parameter improvements

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-26 23:29:50 +01:00
parent e47593f905
commit 2a0c68de16
27 changed files with 248 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml.cs
-8
View File
@@ -1,8 +0,0 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class AddItemContentNavigationView : UserControl
{
public AddItemContentNavigationView() => InitializeComponent();
}
Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml → Bitvault.Avalonia/AddItemNavigationView.axaml
+1 -1
View File
@@ -1,5 +1,5 @@
<UserControl
x:Class="Bitvault.Avalonia.AddItemContentNavigationView"
x:Class="Bitvault.Avalonia.AddItemNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SettingsExpander Header="Add item" IsClickEnabled="True" />
Bitvault.Avalonia/AddItemNavigationView.axaml.cs
+8
View File
@@ -0,0 +1,8 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class AddItemNavigationView : UserControl
{
public AddItemNavigationView() => InitializeComponent();
}
Bitvault.Avalonia/AllNavigationView.axaml
+5 -4
View File
@@ -15,9 +15,7 @@
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Container">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
</NavigateAction.ParameterBindings>
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
<ConditionAction>
@@ -26,7 +24,10 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<InvokeCommandAction Command="{Binding InvokeCommand}" />
<NavigateAction Region="Left" Route="ContentItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
<Parameter Key="Transition" Value="FromRight" />
</NavigateAction>
</ConditionAction>
</DataTriggerBehavior>
</Interaction.Behaviors>
Bitvault.Avalonia/App.axaml.cs
+6 -2
View File
@@ -87,11 +87,15 @@ public partial class App : Application
services.AddScoped<ContainerViewModelConfiguration>();
services.AddTemplate<ContainerViewModel, ContainerView>("Container");
services.AddHandler<AggerateContainerViewModelHandler>();
services.AddTemplate<ContainerItemCollectionViewModel, ContainerItemCollectionView>("ContentItemCollection");
services.AddTemplate<SearchContainerActionViewModel, SearchContainerActionView>();
services.AddTemplate<ContainerHeaderViewModel, ContainerHeaderView>("ContainerHeader");
services.AddTemplate<CreateItemActionViewModel, CreateItemActionView>();
services.AddTemplate<ContainerCategoryCollectionViewModel, ContainerCategoryCollectionView>("ContainerItemCategoryCollection");
services.AddHandler<AggerateContainerItemViewModelHandler>();
services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
services.AddTemplate<ItemViewModel, ItemView>("Item");
@@ -109,7 +113,7 @@ public partial class App : Application
services.AddTemplate<ItemHeaderViewModel, ItemHeaderView>();
services.AddTemplate<ItemContentViewModel, ItemContentView>();
services.AddTemplate<AddItemContentNavigationViewModel, AddItemContentNavigationView>();
services.AddTemplate<AddItemNavigationViewModel, AddItemNavigationView>();
services.AddScoped<IValueStore<Item>, ValueStore<Item>>();
Bitvault.Avalonia/ArchiveNavigationView.axaml
+5 -5
View File
@@ -15,10 +15,8 @@
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Container">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
</NavigateAction.ParameterBindings>
</NavigateAction>
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
<ConditionAction>
<ConditionAction.Condition>
@@ -26,7 +24,9 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<InvokeCommandAction Command="{Binding InvokeCommand}" />
<NavigateAction Region="Left" Route="ContentItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
</DataTriggerBehavior>
</Interaction.Behaviors>
Bitvault.Avalonia/Bitvault.Avalonia.csproj
+8 -2
View File
@@ -40,8 +40,14 @@
<ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="AddItemContentNavigationViewModel.axaml.cs">
<DependentUpon>AddItemContentNavigationViewModel.axaml</DependentUpon>
<Compile Update="AddItemNavigationView.axaml.cs">
<DependentUpon>AddItemNavigationView.axaml</DependentUpon>
</Compile>
<Compile Update="ContainerCategoryCollectionView.axaml.cs">
<DependentUpon>ContainerCategoryCollectionView.axaml</DependentUpon>
</Compile>
<Compile Update="ContainerItemCollectionView.axaml.cs">
<DependentUpon>ContainerItemCollectionView.axaml</DependentUpon>
</Compile>
<Compile Update="CreateItemActionView.axaml.cs">
<DependentUpon>CreateItemActionView.axaml</DependentUpon>
Bitvault.Avalonia/ContainerCategoryCollectionView.axaml
+20
View File
@@ -0,0 +1,20 @@
<UserControl
x:Class="Bitvault.Avalonia.ContainerCategoryCollectionView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:ContainerCategoryCollectionViewModel">
<ListBox
Margin="2,-1,0,0"
AutoScrollToSelectedItem="True"
ItemTemplate="{ReflectionBinding Template}"
ItemsSource="{Binding}"
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
SelectionMode="Single">
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="IsSelected" Value="{ReflectionBinding Selected, Mode=TwoWay}" />
</Style>
</ListBox.Styles>
</ListBox>
</UserControl>
Bitvault.Avalonia/ContainerCategoryCollectionView.axaml.cs
+12
View File
@@ -0,0 +1,12 @@
using Avalonia.Controls;
using FluentAvalonia.UI.Media.Animation;
using Toolkit.UI.Avalonia;
namespace Bitvault.Avalonia;
public partial class ContainerCategoryCollectionView :
UserControl
{
public ContainerCategoryCollectionView() =>
InitializeComponent();
}
Bitvault.Avalonia/ContainerItemCollectionView.axaml
+20
View File
@@ -0,0 +1,20 @@
<UserControl
x:Class="Bitvault.Avalonia.ContainerItemCollectionView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:ContainerItemCollectionViewModel">
<ListBox
Margin="2,-1,0,0"
AutoScrollToSelectedItem="True"
ItemTemplate="{ReflectionBinding Template}"
ItemsSource="{Binding}"
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
SelectionMode="Single">
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="IsSelected" Value="{ReflectionBinding Selected, Mode=TwoWay}" />
</Style>
</ListBox.Styles>
</ListBox>
</UserControl>
Bitvault.Avalonia/ContainerItemCollectionView.axaml.cs
+10
View File
@@ -0,0 +1,10 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class ContainerItemCollectionView :
UserControl
{
public ContainerItemCollectionView() =>
InitializeComponent();
}
Bitvault.Avalonia/ContainerView.axaml
+12 -16
View File
@@ -22,21 +22,17 @@
</Interaction.Behaviors>
</ContentControl>
</Grid>
<ListBox
Grid.Row="1"
Grid.Column="0"
Margin="2,-1,0,0"
AutoScrollToSelectedItem="True"
ItemTemplate="{ReflectionBinding Template}"
ItemsSource="{Binding}"
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
SelectionMode="Single">
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="IsSelected" Value="{ReflectionBinding Selected, Mode=TwoWay}" />
</Style>
</ListBox.Styles>
</ListBox>
<Frame Grid.Row="1" Grid.Column="0">
<Interaction.Behaviors>
<AttachedBehaviour>
<NavigateRegionAction Name="Left">
<NavigateAction Region="Left" Route="ContentItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</NavigateRegionAction>
</AttachedBehaviour>
</Interaction.Behaviors>
</Frame>
<GridSplitter
Grid.Row="1"
Grid.Column="1"
@@ -64,7 +60,7 @@
</Interaction.Behaviors>
</ContentControl>
</Border>
<ContentControl x:Name="Content" Grid.Row="1">
<ContentControl Grid.Row="1">
<Interaction.Behaviors>
<AttachedBehaviour>
<NavigateRegionAction Name="{Binding Named, StringFormat='{}{0}:Content'}" />
Bitvault.Avalonia/CreateItemActionView.axaml
+3 -8
View File
@@ -28,14 +28,9 @@
</Grid>
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Click">
<NavigateAction
Region="{Binding Named, StringFormat='{}{0}:Content'}"
Route="Item"
Scope="new">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Immutable" Value="{x:False}" />
</NavigateAction.ParameterBindings>
</NavigateAction>
<NavigateAction Region="Left" Route="ContainerItemCategoryCollection">
<Parameter Key="Transition" Value="FromRight" />
</NavigateAction>
</EventTriggerBehavior>
</Interaction.Behaviors>
</Button>
Bitvault.Avalonia/ItemNavigationView.axaml
+8 -12
View File
@@ -20,12 +20,10 @@
Region="{Binding Named, StringFormat='{}{0}:Content'}"
Route="Item"
Scope="self">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Name" Value="{Binding Name}" />
<ParameterBinding Key="Immutable" Value="{x:True}" />
<ParameterBinding Key="Archived" Value="{Binding Archived}" />
<ParameterBinding Key="Favourite" Value="{Binding Favourite}" />
</NavigateAction.ParameterBindings>
<Parameter Key="Name" Value="{Binding Name}" />
<Parameter Key="Immutable" Value="{x:True}" />
<Parameter Key="Archived" Value="{Binding Archived}" />
<Parameter Key="Favourite" Value="{Binding Favourite}" />
</NavigateAction>
</ConditionAction>
</AttachedBehaviour>
@@ -34,12 +32,10 @@
Region="{Binding Named, StringFormat='{}{0}:Content'}"
Route="Item"
Scope="self">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Name" Value="{Binding Name}" />
<ParameterBinding Key="Immutable" Value="{x:True}" />
<ParameterBinding Key="Archived" Value="{Binding Archived}" />
<ParameterBinding Key="Favourite" Value="{Binding Favourite}" />
</NavigateAction.ParameterBindings>
<Parameter Key="Name" Value="{Binding Name}" />
<Parameter Key="Immutable" Value="{x:True}" />
<Parameter Key="Archived" Value="{Binding Archived}" />
<Parameter Key="Favourite" Value="{Binding Favourite}" />
</NavigateAction>
</DataTriggerBehavior>
</Interaction.Behaviors>
Bitvault.Avalonia/StarredNavigationView.axaml
+4 -4
View File
@@ -15,9 +15,7 @@
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Container">
<NavigateAction.ParameterBindings>
<ParameterBinding Key="Filter" Value="{Binding Filter}" />
</NavigateAction.ParameterBindings>
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
<ConditionAction>
@@ -26,7 +24,9 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<InvokeCommandAction Command="{Binding InvokeCommand}" />
<NavigateAction Region="Left" Route="ContentItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
</DataTriggerBehavior>
</Interaction.Behaviors>