Fixed more edge cases

Bitvault.Avalonia/App.axaml.cs

@@ -42,8 +42,7 @@ public partial class App : Application
                 {
                     args.AddServices(services =>
                     {
-                        services.AddTransient<IComparer<Item>>(provider => Comparer<Item>.Create((x, z) => 
-                            x.Name!.CompareTo(z.Name) == 0 ? 1 : x.Name!.CompareTo(z.Name)));
+                        services.AddTransient<IComparer<Item>>(provider => Comparer<Item>.Create((x, z) => x.Name.CompareTo(z.Name)));
 
                         services.AddCache<Item>();
 
@@ -69,7 +68,8 @@ public partial class App : Application
                         }); 
 
                         services.AddHandler<QueryContainerHandler>();
-                        services.AddHandler<CreateItemHander>();
+                        services.AddHandler<CreateItemHandler>();
+                        services.AddHandler<EditItemHander>();
 
                         services.AddHandler<OpenContainerHandler>();
 
@@ -108,13 +108,14 @@ public partial class App : Application
 
                         services.AddScoped<IValueStore<Item>, ValueStore<Item>>();
 
-                        services.AddHandler<ConfirmItemHandler>(ServiceLifetime.Scoped);
-                        services.AddHandler<ArchiveItemHandler>(ServiceLifetime.Scoped);
-                        services.AddHandler<UnarchiveItemHandler>(ServiceLifetime.Scoped);
-                        services.AddHandler<FavouriteItemHandler>(ServiceLifetime.Scoped);
-                        services.AddHandler<UnfavouriteItemHandler>(ServiceLifetime.Scoped);
+                        services.AddHandler<ConfirmItemHandler>();
+                        services.AddHandler<ArchiveItemHandler>();
+                        services.AddHandler<UnarchiveItemHandler>();
+                        services.AddHandler<FavouriteItemHandler>();
+                        services.AddHandler<UnfavouriteItemHandler>();
 
-                        services.AddHandler<ItemActivatedHandler>(ServiceLifetime.Singleton);
+                        services.AddHandler<CreatedItemHandler>(ServiceLifetime.Singleton);
+                        services.AddHandler<ModifiedItemHandler>(ServiceLifetime.Singleton);
                     });
                 })!);
 

Bitvault.Avalonia/CreateItemActionView.axaml

@@ -28,14 +28,10 @@
         </Grid>
         <Interaction.Behaviors>
             <EventTriggerBehavior EventName="Click">
-                <NavigateAction
-                    Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
-                    Route="ItemCommandHeader"
-                    Scope="self" />
                 <NavigateAction
                     Region="{Binding Named, StringFormat='{}{0}:Content'}"
                     Route="Item"
-                    Scope="self">
+                    Scope="new">
                     <NavigateAction.ParameterBindings>
                         <ParameterBinding Key="Immutable" Value="{x:False}" />
                     </NavigateAction.ParameterBindings>

Bitvault.Avalonia/ItemHeaderView.axaml

@@ -12,7 +12,7 @@
         <TextBox
             MaxWidth="360"
             IsVisible="{Binding !Immutable}"
-            Text="{Binding Value}"
+            Text="{Binding Value, UpdateSourceTrigger=PropertyChanged}"
             TextAlignment="Center"
             Watermark="Enter name" />
         <SelectableTextBlock

Bitvault.Avalonia/ItemNavigationView.axaml

@@ -10,15 +10,12 @@
     </ListBoxItem.Resources>
     <Interaction.Behaviors>
         <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
-            <NavigateAction
-                Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
-                Route="ItemCommandHeader"
-                Scope="self" />
             <NavigateAction
                 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}" />

Bitvault.Avalonia/ItemView.axaml

@@ -4,6 +4,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:vm="using:Bitvault"
     x:DataType="vm:ItemViewModel">
+    <Interaction.Behaviors>
+        <AttachedBehaviour>
+            <NavigateAction
+                Region="{Binding Named, StringFormat='{}{0}:ContentHeader'}"
+                Route="ItemCommandHeader"
+                Scope="self" />
+        </AttachedBehaviour>
+    </Interaction.Behaviors>
     <ScrollViewer Padding="12,12,12,0">
         <ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}" />
     </ScrollViewer>