This commit is contained in:
TheXamlGuy
2024-05-24 08:21:49 +01:00
parent e82fa8d05f
commit 12d1392207
90 changed files with 146 additions and 168 deletions
+9 -9
View File
@@ -1,16 +1,16 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Bitvault.Data;
using HotAvalonia;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
using System;
using System.Collections.Generic;
using Toolkit.Avalonia;
using Toolkit.Foundation;
using Microsoft.Extensions.DependencyInjection.Extensions;
using HotAvalonia;
using Bitvault.Data;
using System.Collections.Generic;
using System;
namespace Bitvault.Avalonia;
@@ -39,7 +39,7 @@ public partial class App : Application
services.AddHandler<ContainerActivatedHandler>();
services.AddTransient<IContainerComponent> (provider => Component.Create<ContainerComponent>(provider, args =>
services.AddTransient<IContainerComponent>(provider => Component.Create<ContainerComponent>(provider, args =>
{
args.AddServices(services =>
{
@@ -62,12 +62,12 @@ public partial class App : Application
services.AddDbContextFactory<ContainerDbContext>((provider, args) =>
{
if (provider.GetRequiredService<IValueStore<ContainerConnection>>()
if (provider.GetRequiredService<IValueStore<ContainerConnection>>()
is IValueStore<ContainerConnection> connection)
{
args.UseSqlite($"{connection.Value}");
}
});
});
services.AddHandler<QueryContainerHandler>();
services.AddHandler<CreateItemHandler>();
@@ -121,7 +121,7 @@ public partial class App : Application
});
})!);
services.AddTransient<IContainerFactory, ContainerFactory>();
services.AddTransient<IContainerFactory, ContainerFactory>();
services.AddHandler<CreateContainerHandler>();
services.AddSingleton<IContainerHostCollection, ContainerHostCollection>();
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ArchiveItemActionView : UserControl
{
public ArchiveItemActionView() => InitializeComponent();
}
}
+4 -4
View File
@@ -21,11 +21,11 @@
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.999-cibuild0048140-alpha" />
<PackageReference Include="Avalonia.Labs.Controls" Version="11.0.10.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview1" />
<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0-preview5" />
<PackageReference Include="System.Reactive" Version="6.0.1" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0-beta2.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.3.24172.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.3.24172.4">
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.4.24266.19" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0-preview.4.24267.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ConfirmItemActionView : UserControl
{
public ConfirmItemActionView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ContainerHeaderView : UserControl
{
public ContainerHeaderView() => InitializeComponent();
}
}
+5 -2
View File
@@ -29,7 +29,7 @@
AutoScrollToSelectedItem="True"
ItemTemplate="{ReflectionBinding Template}"
ItemsSource="{Binding}"
SelectedItem="{Binding SelectedItem}"
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
SelectionMode="Single">
<ListBox.Styles>
<Style Selector="ListBoxItem">
@@ -52,7 +52,10 @@
BorderThickness="1,1,0,0"
CornerRadius="8 0 0 0">
<Grid RowDefinitions="Auto, *">
<Border Grid.Row="0" Padding="4" Height="44">
<Border
Grid.Row="0"
Height="44"
Padding="4">
<ContentControl>
<Interaction.Behaviors>
<AttachedBehaviour>
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class CreateItemActionView : UserControl
{
public CreateItemActionView() => InitializeComponent();
}
}
@@ -9,4 +9,4 @@ namespace Bitvault.Avalonia
InitializeComponent();
}
}
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class DismissItemActionView : UserControl
{
public DismissItemActionView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class EditItemActionView : UserControl
{
public EditItemActionView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class FavouriteItemActionView : UserControl
{
public FavouriteItemActionView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ItemCommandHeaderView : UserControl
{
public ItemCommandHeaderView() => InitializeComponent();
}
}
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ItemHeaderView : UserControl
{
public ItemHeaderView() => InitializeComponent();
}
}
+1 -1
View File
@@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:ItemNavigationViewModel"
IsSelected="{Binding Selected}">
IsSelected="{Binding Selected, Mode=TwoWay}">
<ListBoxItem.Resources>
<SolidColorBrush x:Key="StarredIconForegroundBrush" Color="#FFEDB120" />
</ListBoxItem.Resources>
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ItemNavigationView : ListBoxItem
{
public ItemNavigationView() => InitializeComponent();
}
}
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ItemView : UserControl
{
public ItemView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class SearchContainerActionView : UserControl
{
public SearchContainerActionView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class UnarchiveItemActionView : UserControl
{
public UnarchiveItemActionView() => InitializeComponent();
}
}