Parameter improvements

Bitvault.Avalonia/AddItemContentNavigationViewModel.axaml.cs

@@ -1,8 +0,0 @@
-using Avalonia.Controls;
-
-namespace Bitvault.Avalonia;
-
-public partial class AddItemContentNavigationView : UserControl
-{
-    public AddItemContentNavigationView() => InitializeComponent();
-}

Bitvault.Avalonia/AddItemNavigationView.axaml

@@ -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

@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class AddItemNavigationView : UserControl
+{
+    public AddItemNavigationView() => InitializeComponent();
+}

Bitvault.Avalonia/AllNavigationView.axaml

@@ -15,9 +15,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Container">
-                    <NavigateAction.ParameterBindings>
+                    <Parameter Key="Filter" Value="{Binding Filter}" />
-                        <ParameterBinding Key="Filter" Value="{Binding Filter}" />
-                    </NavigateAction.ParameterBindings>
                 </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

@@ -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

@@ -15,9 +15,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Container">
-                    <NavigateAction.ParameterBindings>
+					<Parameter Key="Filter" Value="{Binding Filter}" />
-                        <ParameterBinding Key="Filter" Value="{Binding Filter}" />
-                    </NavigateAction.ParameterBindings>
 				</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>

Bitvault.Avalonia/Bitvault.Avalonia.csproj

@@ -40,8 +40,14 @@
 	  <ProjectReference Include="..\Toolkit\Toolkit.UI.Controls.Avalonia\Toolkit.UI.Controls.Avalonia.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <Compile Update="AddItemContentNavigationViewModel.axaml.cs">
+	  <Compile Update="AddItemNavigationView.axaml.cs">
-	    <DependentUpon>AddItemContentNavigationViewModel.axaml</DependentUpon>
+	    <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

@@ -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

@@ -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

@@ -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

@@ -0,0 +1,10 @@
+using Avalonia.Controls;
+
+namespace Bitvault.Avalonia;
+
+public partial class ContainerItemCollectionView :
+    UserControl
+{
+    public ContainerItemCollectionView() =>
+        InitializeComponent();
+}

Bitvault.Avalonia/ContainerView.axaml

@@ -22,21 +22,17 @@
                 </Interaction.Behaviors>
             </ContentControl>
         </Grid>
-        <ListBox
+        <Frame Grid.Row="1" Grid.Column="0">
-            Grid.Row="1"
+            <Interaction.Behaviors>
-            Grid.Column="0"
+                <AttachedBehaviour>
-            Margin="2,-1,0,0"
+                    <NavigateRegionAction Name="Left">
-            AutoScrollToSelectedItem="True"
+                        <NavigateAction Region="Left" Route="ContentItemCollection">
-            ItemTemplate="{ReflectionBinding Template}"
+                            <Parameter Key="Filter" Value="{Binding Filter}" />
-            ItemsSource="{Binding}"
+                        </NavigateAction>
-            SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+                    </NavigateRegionAction>
-            SelectionMode="Single">
+                </AttachedBehaviour>
-            <ListBox.Styles>
+            </Interaction.Behaviors>
-                <Style Selector="ListBoxItem">
+        </Frame>
-                    <Setter Property="IsSelected" Value="{ReflectionBinding Selected, Mode=TwoWay}" />
-                </Style>
-            </ListBox.Styles>
-        </ListBox>
         <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

@@ -28,13 +28,8 @@
         </Grid>
         <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
-                <NavigateAction
+                <NavigateAction Region="Left" Route="ContainerItemCategoryCollection">
-                    Region="{Binding Named, StringFormat='{}{0}:Content'}"
+					<Parameter Key="Transition" Value="FromRight" />
-                    Route="Item"
-                    Scope="new">
-                    <NavigateAction.ParameterBindings>
-                        <ParameterBinding Key="Immutable" Value="{x:False}" />
-                    </NavigateAction.ParameterBindings>
 				</NavigateAction>
             </EventTriggerBehavior>
         </Interaction.Behaviors>

Bitvault.Avalonia/ItemNavigationView.axaml

@@ -20,12 +20,10 @@
                     Region="{Binding Named, StringFormat='{}{0}:Content'}"
                     Route="Item"
                     Scope="self">
-                    <NavigateAction.ParameterBindings>
+                    <Parameter Key="Name" Value="{Binding Name}" />
-                        <ParameterBinding Key="Name" Value="{Binding Name}" />
+                    <Parameter Key="Immutable" Value="{x:True}" />
-                        <ParameterBinding Key="Immutable" Value="{x:True}" />
+                    <Parameter Key="Archived" Value="{Binding Archived}" />
-                        <ParameterBinding Key="Archived" Value="{Binding Archived}" />
+                    <Parameter Key="Favourite" Value="{Binding Favourite}" />
-                        <ParameterBinding Key="Favourite" Value="{Binding Favourite}" />
-                    </NavigateAction.ParameterBindings>
                 </NavigateAction>
             </ConditionAction>
         </AttachedBehaviour>
@@ -34,12 +32,10 @@
                 Region="{Binding Named, StringFormat='{}{0}:Content'}"
                 Route="Item"
                 Scope="self">
-                <NavigateAction.ParameterBindings>
+				<Parameter Key="Name" Value="{Binding Name}" />
-                    <ParameterBinding Key="Name" Value="{Binding Name}" />
+				<Parameter Key="Immutable" Value="{x:True}" />
-                    <ParameterBinding Key="Immutable" Value="{x:True}" />
+				<Parameter Key="Archived" Value="{Binding Archived}" />
-                    <ParameterBinding Key="Archived" Value="{Binding Archived}" />
+				<Parameter Key="Favourite" Value="{Binding Favourite}" />
-                    <ParameterBinding Key="Favourite" Value="{Binding Favourite}" />
-                </NavigateAction.ParameterBindings>
             </NavigateAction>
         </DataTriggerBehavior>
     </Interaction.Behaviors>

Bitvault.Avalonia/StarredNavigationView.axaml

@@ -15,9 +15,7 @@
                     </ConditionalExpression>
                 </ConditionAction.Condition>
                 <NavigateAction Region="Main" Route="Container">
-                    <NavigateAction.ParameterBindings>
+                    <Parameter Key="Filter" Value="{Binding Filter}" />
-                        <ParameterBinding Key="Filter" Value="{Binding Filter}" />
-                    </NavigateAction.ParameterBindings>
                 </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>

Bitvault/AddItemContentNavigationViewModel.cs

@@ -1,17 +0,0 @@
-using Toolkit.Foundation;
-
-namespace Bitvault;
-
-public partial class AddItemContentNavigationViewModel : Observable,
-    IItemEntryViewModel
-{
-    public AddItemContentNavigationViewModel(IServiceProvider provider,
-        IServiceFactory factory,
-        IMediator mediator, 
-        IPublisher publisher, 
-        ISubscription subscriber, 
-        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
-    {
-
-    }
-}

Bitvault/AddItemNavigationViewModel.cs

@@ -0,0 +1,11 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public partial class AddItemNavigationViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscription subscriber,
+    IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer),
+    IItemEntryViewModel;

Bitvault/AggerateContainerCategoryViewModelHandler.cs

@@ -0,0 +1,21 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+public class AggerateContainerCategoryViewModelHandler(IServiceFactory serviceFactory,
+    IPublisher publisher) :
+    INotificationHandler<AggerateEventArgs<ItemNavigationViewModel,
+        ContainerViewModelConfiguration>>
+{
+    public Task Handle(AggerateEventArgs<ItemNavigationViewModel,
+    ContainerViewModelConfiguration> args)
+    {
+        if (serviceFactory.Create<ItemNavigationViewModel>() 
+            is ItemNavigationViewModel viewModel)
+        {
+            publisher.Publish(Create.As(viewModel), nameof(ContainerCategoryCollectionViewModel));
+        }
+
+        return Task.CompletedTask;
+    }
+}

Bitvault/AggerateContainerItemViewModelHandler.cs

@@ -3,11 +3,12 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-public class AggerateContainerViewModelHandler(IMediator mediator,
+public class AggerateContainerItemViewModelHandler(IMediator mediator,
     IServiceProvider serviceProvider,
     ICache<Item> cache,
     IPublisher publisher) :
-    INotificationHandler<AggerateEventArgs<ItemNavigationViewModel, ContainerViewModelConfiguration>>
+    INotificationHandler<AggerateEventArgs<ItemNavigationViewModel, 
+        ContainerViewModelConfiguration>>
 {
     public async Task Handle(AggerateEventArgs<ItemNavigationViewModel,
         ContainerViewModelConfiguration> args)
@@ -15,7 +16,6 @@ public class AggerateContainerViewModelHandler(IMediator mediator,
         if (args.Options is ContainerViewModelConfiguration configuration)
         {
             cache.Clear();
-            var dd = cache;
             bool selected = true;
 
             if (await mediator.Handle<RequestEventArgs<QueryContainerConfiguration>,
@@ -37,7 +37,7 @@ public class AggerateContainerViewModelHandler(IMediator mediator,
                         valueStore.Set(item);
 
                         cache.Add(item);
-                        publisher.Publish(Create.As(viewModel), nameof(ContainerViewModel));
+                        publisher.Publish(Create.As(viewModel), nameof(ContainerItemCollectionViewModel));
                     }
 
                     selected = false;

Bitvault/CommandCollection.cs

@@ -2,10 +2,7 @@
 
 namespace Bitvault;
 
-public class CommandCollection :
+public class CommandCollection(IList<IDisposable> list) :
-    ReadOnlyCollection<IDisposable>
+    ReadOnlyCollection<IDisposable>(list)
 {
-    public CommandCollection(IList<IDisposable> list) : base(list)
-    {
-    }
 }

Bitvault/ContainerCategoryCollectionViewModel.cs

@@ -0,0 +1,18 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+[Aggerate(nameof(ContainerCategoryCollectionViewModel))]
+public partial class ContainerCategoryCollectionViewModel :
+    ObservableCollection<ItemNavigationViewModel>
+{
+    public ContainerCategoryCollectionViewModel(IServiceProvider provider, 
+        IServiceFactory factory,
+        IMediator mediator,
+        IPublisher publisher,
+        ISubscription subscriber, 
+        IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
+    {
+
+    }
+}

Bitvault/ContainerItemCollectionViewModel.cs

@@ -0,0 +1,54 @@
+using Toolkit.Foundation;
+
+namespace Bitvault;
+
+[Aggerate(nameof(ContainerItemCollectionViewModel))]
+public partial class ContainerItemCollectionViewModel :
+    ObservableCollection<ItemNavigationViewModel>,
+    INotificationHandler<NotifyEventArgs<Filter>>,
+    INotificationHandler<NotifyEventArgs<Search>>
+{
+    private ContainerViewModelConfiguration configuration;
+
+    public ContainerItemCollectionViewModel(IServiceProvider provider,
+        IServiceFactory factory,
+        IMediator mediator,
+        IPublisher publisher,
+        ISubscription subscriber,
+        IDisposer disposer,
+        IContentTemplate template,
+        ContainerViewModelConfiguration configuration,
+        string? filter = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
+    {
+        Template = template;
+        this.configuration = configuration with { Filter = filter };
+    }
+
+    public IContentTemplate Template { get; set; }
+
+    public Task Handle(NotifyEventArgs<Filter> args)
+    {
+        if (args.Value is Filter filter)
+        {
+            configuration = configuration with { Filter = filter.Value };
+            BeginAggregation();
+        }
+
+        return Task.CompletedTask;
+    }
+
+    public Task Handle(NotifyEventArgs<Search> args)
+    {
+        if (args.Value is Search search)
+        {
+            configuration = configuration with { Query = search.Value };
+            BeginAggregation();
+        }
+
+        return Task.CompletedTask;
+    }
+
+    protected override IAggerate OnPrepareAggregation(object? key) =>
+        Aggerate.With<ItemNavigationViewModel, ContainerViewModelConfiguration>(configuration)
+            with { Key = key };
+}

Bitvault/ContainerViewModel.cs

@@ -3,55 +3,25 @@ using Toolkit.Foundation;
 
 namespace Bitvault;
 
-[Aggerate(nameof(ContainerViewModel))]
+public partial class ContainerViewModel :
-public partial class ContainerViewModel : ObservableCollection<ItemNavigationViewModel>,
+    Observable
-    INotificationHandler<NotifyEventArgs<Filter>>,
-    INotificationHandler<NotifyEventArgs<Search>>
 {
     [ObservableProperty]
     private string named;
 
+    [ObservableProperty]
+    private string filter;
     public ContainerViewModel(IServiceProvider provider,
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
         ISubscription subscriber,
         IDisposer disposer,
-        IContentTemplate template,
-        ContainerViewModelConfiguration configuration,
         NamedComponent named,
-        string? filter = null) : base(provider, factory, mediator, publisher, subscriber, disposer)
+        string filter) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-        Template = template;
         Named = $"{named}";
-
+        Filter = filter;
-        this.configuration = configuration with { Filter = filter };
-    }
-
-    private ContainerViewModelConfiguration configuration;
-
-    public IContentTemplate Template { get; set; }
-
-    public Task Handle(NotifyEventArgs<Filter> args)
-    {
-        if (args.Value is Filter filter)
-        {
-            configuration = configuration with { Filter = filter.Value };
-            BeginAggregation();
-        }
-
-        return Task.CompletedTask;
-    }
-
-    public Task Handle(NotifyEventArgs<Search> args)
-    {
-        if (args.Value is Search search)
-        {
-            configuration = configuration with { Query = search.Value };
-            BeginAggregation();
-        }
-
-        return Task.CompletedTask;
     }
 
     public override async Task OnActivated()
@@ -65,6 +35,4 @@ public partial class ContainerViewModel : ObservableCollection<ItemNavigationVie
         Publisher.Publish(Deactivated.As<Container>());
         await base.OnDeactivated();
     }
-    protected override IAggerate OnPrepareAggregation(object? key) =>
-        Aggerate.With<ItemNavigationViewModel, ContainerViewModelConfiguration>(configuration) with { Key = key };
 }

Bitvault/FilterContainerNavigationViewModel.cs

@@ -37,5 +37,5 @@ public partial class FilterContainerNavigationViewModel : Observable,
 
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Notify.As(new Filter(Filter)),
-        nameof(ContainerViewModel));
+        nameof(ContainerItemCollectionViewModel));
 }

Bitvault/ItemContentViewModel.cs

@@ -18,7 +18,7 @@ public partial class ItemContentViewModel :
 
         if (!immutable)
         {
-            Insert<AddItemContentNavigationViewModel>();
+            Insert<AddItemNavigationViewModel>();
         }
     }
 

Bitvault/SearchContainerActionViewModel.cs

@@ -17,5 +17,5 @@ public partial class SearchContainerActionViewModel(IServiceProvider provider,
 
     [RelayCommand]
     public void Invoke() => Publisher.Publish(Notify.As(new Search(Value)),
-        nameof(ContainerViewModel));
+        nameof(ContainerItemCollectionViewModel));
 }