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

wip

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-27 04:19:06 +01:00
parent 6a779c1c7d
commit 601e74b6ec
21 changed files with 123 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bitvault.Avalonia/App.axaml.cs
+22 -6
View File
@@ -25,8 +25,16 @@ public partial class App : Application
public override async void OnFrameworkInitializationCompleted()
{
IHost? host = DefaultHostBuilder.Create()
.AddConfiguration<ContainerConfiguration>(args => args.Name = "Personal",
"Vault:*")
.AddConfiguration<ContainerConfiguration>("Locker:*")
.AddConfiguration<ItemConfiguration>("Item:*")
.AddConfiguration<ItemConfiguration>(args => args.Name = "Bank Account", "Item:Bank Account")
.AddConfiguration<ItemConfiguration>(args => args.Name = "Credit Card", "Item:Credit Card")
.AddConfiguration<ItemConfiguration>(args => args.Name = "Document", "Item:Document")
.AddConfiguration<ItemConfiguration>(args => args.Name = "Driving Licence", "Item:Driving Licence")
.AddConfiguration<ItemConfiguration>(args => args.Name = "Identity", "Item:Identity")
.AddConfiguration<ItemConfiguration>(args => args.Name = "Login", "Item:Login")
.AddConfiguration<ItemConfiguration>(args => args.Name = "Note", "Item:Note")
.AddConfiguration<ItemConfiguration>(args => args.Name = "Password", "Item:Password")
.ConfigureServices((context, services) =>
{
services.AddAvalonia();
@@ -37,6 +45,9 @@ public partial class App : Application
services.AddTemplate<MainWindowViewModel, MainWindow>("MainWindow");
}
services.AddScoped<IProxyService<IEnumerable<ItemConfiguration>>>(provider =>
new ProxyService<IEnumerable<ItemConfiguration>>(provider.GetRequiredService<IEnumerable<ItemConfiguration>>()));
services.AddHandler<ContainerActivatedHandler>();
services.AddTransient<IContainerComponent>(provider => Component.Create<ContainerComponent>(provider, args =>
@@ -48,6 +59,9 @@ public partial class App : Application
services.AddCache<Item>();
services.AddTransient(_ =>
provider.GetRequiredService<IProxyService<IEnumerable<ItemConfiguration>>>());
services.AddTransient<IKeyGenerator, KeyGenerator>();
services.AddTransient<IEncryptor, AesEncryptor>();
services.AddTransient<IDecryptor, AesDecryptor>();
@@ -87,15 +101,17 @@ public partial class App : Application
services.AddScoped<ContainerViewModelConfiguration>();
services.AddTemplate<ContainerViewModel, ContainerView>("Container");
services.AddTemplate<ContainerItemCollectionViewModel, ContainerItemCollectionView>("ContentItemCollection");
services.AddTemplate<ItemCollectionViewModel, ItemCollectionView>("ContentItemCollection");
services.AddHandler<AggerateContainerItemViewModelHandler>();
services.AddTemplate<SearchContainerActionViewModel, SearchContainerActionView>();
services.AddTemplate<ContainerHeaderViewModel, ContainerHeaderView>("ContainerHeader");
services.AddTemplate<CreateItemActionViewModel, CreateItemActionView>();
services.AddTemplate<ContainerCategoryCollectionViewModel, ContainerCategoryCollectionView>("ContainerItemCategoryCollection");
services.AddHandler<AggerateContainerItemViewModelHandler>();
services.AddTemplate<ItemCategoryCollectionViewModel, ItemCategoryCollectionView>("ContainerItemCategoryCollection");
services.AddTemplate<ItemCategoryNavigationViewModel, ItemCategoryNavigationView>();
services.AddHandler<AggerateContainerCategoryViewModelHandler>();
services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
services.AddTemplate<ItemViewModel, ItemView>("Item");
Bitvault.Avalonia/ArchiveNavigationView.axaml
+5 -4
View File
@@ -15,8 +15,8 @@
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Container">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
<ConditionAction>
<ConditionAction.Condition>
@@ -25,8 +25,9 @@
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Left" Route="ContentItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
<Parameter Key="Filter" Value="{Binding Filter}" />
<Parameter Key="Transition" Value="FromRight" />
</NavigateAction>
</ConditionAction>
</DataTriggerBehavior>
</Interaction.Behaviors>
Bitvault.Avalonia/Bitvault.Avalonia.csproj
+7 -4
View File
@@ -43,11 +43,14 @@
<Compile Update="AddItemNavigationView.axaml.cs">
<DependentUpon>AddItemNavigationView.axaml</DependentUpon>
</Compile>
<Compile Update="ContainerCategoryCollectionView.axaml.cs">
<DependentUpon>ContainerCategoryCollectionView.axaml</DependentUpon>
<Compile Update="ItemCategoryNavigationView.axaml.cs">
<DependentUpon>ItemCategoryNavigationView.axaml</DependentUpon>
</Compile>
<Compile Update="ContainerItemCollectionView.axaml.cs">
<DependentUpon>ContainerItemCollectionView.axaml</DependentUpon>
<Compile Update="ItemCategoryCollectionView.axaml.cs">
<DependentUpon>ItemCategoryCollectionView.axaml</DependentUpon>
</Compile>
<Compile Update="ItemCollectionView.axaml.cs">
<DependentUpon>ItemCollectionView.axaml</DependentUpon>
</Compile>
<Compile Update="CreateItemActionView.axaml.cs">
<DependentUpon>CreateItemActionView.axaml</DependentUpon>
Bitvault.Avalonia/ContainerCategoryCollectionView.axaml.cs
-12
View File
@@ -1,12 +0,0 @@
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/CreateContainerNavigationView.axaml.cs
+2 -1
View File
@@ -4,5 +4,6 @@ namespace Bitvault.Avalonia;
public partial class CreateContainerNavigationView : SettingsExpander
{
public CreateContainerNavigationView() => InitializeComponent();
public CreateContainerNavigationView() =>
InitializeComponent();
}
Bitvault.Avalonia/ContainerItemCollectionView.axaml → Bitvault.Avalonia/ItemCategoryCollectionView.axaml
+2 -2
View File
@@ -1,9 +1,9 @@
<UserControl
x:Class="Bitvault.Avalonia.ContainerItemCollectionView"
x:Class="Bitvault.Avalonia.ItemCategoryCollectionView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:ContainerItemCollectionViewModel">
x:DataType="vm:ItemCategoryCollectionViewModel">
<ListBox
Margin="2,-1,0,0"
AutoScrollToSelectedItem="True"
Bitvault.Avalonia/ContainerItemCollectionView.axaml.cs → Bitvault.Avalonia/ItemCategoryCollectionView.axaml.cs
+2 -2
View File
@@ -2,9 +2,9 @@ using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class ContainerItemCollectionView :
public partial class ItemCategoryCollectionView :
UserControl
{
public ContainerItemCollectionView() =>
public ItemCategoryCollectionView() =>
InitializeComponent();
}
Bitvault.Avalonia/ItemCategoryNavigationView.axaml
+7
View File
@@ -0,0 +1,7 @@
<ListBoxItem
x:Class="Bitvault.Avalonia.ItemCategoryNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:ItemCategoryNavigationViewModel"
Content="{Binding Name}" />
Bitvault.Avalonia/ItemCategoryNavigationView.axaml.cs
+9
View File
@@ -0,0 +1,9 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class ItemCategoryNavigationView : UserControl
{
public ItemCategoryNavigationView() =>
InitializeComponent();
}
Bitvault.Avalonia/ContainerCategoryCollectionView.axaml → Bitvault.Avalonia/ItemCollectionView.axaml
+2 -2
View File
@@ -1,9 +1,9 @@
<UserControl
x:Class="Bitvault.Avalonia.ContainerCategoryCollectionView"
x:Class="Bitvault.Avalonia.ItemCollectionView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:ContainerCategoryCollectionViewModel">
x:DataType="vm:ItemCollectionViewModel">
<ListBox
Margin="2,-1,0,0"
AutoScrollToSelectedItem="True"
Bitvault.Avalonia/ItemCollectionView.axaml.cs
+10
View File
@@ -0,0 +1,10 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class ItemCollectionView :
UserControl
{
public ItemCollectionView() =>
InitializeComponent();
}
Bitvault.Avalonia/StarredNavigationView.axaml
+1
View File
@@ -26,6 +26,7 @@
</ConditionAction.Condition>
<NavigateAction Region="Left" Route="ContentItemCollection">
<Parameter Key="Filter" Value="{Binding Filter}" />
<Parameter Key="Transition" Value="FromRight" />
</NavigateAction>
</ConditionAction>
</DataTriggerBehavior>