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

Mass rename to align planned codename

Browse Source
This commit is contained in:
TheXamlGuy
2024-05-27 16:08:18 +01:00
parent 2c066097f6
commit 3631d666f5
98 changed files with 550 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bitvault.Avalonia/AllNavigationView.axaml
+1 -1
View File
@@ -14,7 +14,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Container">
<NavigateAction Region="Main" Route="Locker">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
Bitvault.Avalonia/App.axaml.cs
+34 -33
View File
@@ -9,6 +9,7 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Hosting;
using System;
using System.Collections.Generic;
using System.Text.Json;
using Toolkit.Avalonia;
using Toolkit.Foundation;
@@ -25,16 +26,16 @@ public partial class App : Application
public override async void OnFrameworkInitializationCompleted()
{
IHost? host = DefaultHostBuilder.Create()
.AddConfiguration<ContainerConfiguration>("Locker:*")
.AddConfiguration<LockerConfiguration>("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")
//.AddConfiguration<ItemConfiguration>(args => args.Name = "Bank Account", "Item:Bank Account")
.AddConfiguration("Item:Credit Card", ItemConfiguration.CreditCard)
//.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();
@@ -48,9 +49,9 @@ public partial class App : Application
services.AddScoped<IProxyService<IEnumerable<ItemConfiguration>>>(provider =>
new ProxyService<IEnumerable<ItemConfiguration>>(provider.GetRequiredService<IEnumerable<ItemConfiguration>>()));
services.AddHandler<ContainerActivatedHandler>();
services.AddHandler<LockerActivatedHandler>();
services.AddTransient<IContainerComponent>(provider => Component.Create<ContainerComponent>(provider, args =>
services.AddTransient<ILockerComponent>(provider => Component.Create<LockerComponent>(provider, args =>
{
args.AddServices(services =>
{
@@ -70,48 +71,48 @@ public partial class App : Application
services.AddTransient<IKeyDeriver, KeyDeriver>();
services.AddTransient<ISecurityKeyFactory, SecurityKeyFactory>();
services.AddTransient<IContainerStorageFactory, ContainerStorageFactory>();
services.AddTransient<ILockerStorageFactory, LockerStorageFactory>();
services.TryAddSingleton<IValueStore<SecurityKey>, ValueStore<SecurityKey>>();
services.TryAddSingleton<IValueStore<ContainerConnection>, ValueStore<ContainerConnection>>();
services.TryAddSingleton<IValueStore<LockerConnection>, ValueStore<LockerConnection>>();
services.AddDbContextFactory<ContainerDbContext>((provider, args) =>
services.AddDbContextFactory<LockerContext>((provider, args) =>
{
if (provider.GetRequiredService<IValueStore<ContainerConnection>>()
is IValueStore<ContainerConnection> connection)
if (provider.GetRequiredService<IValueStore<LockerConnection>>()
is IValueStore<LockerConnection> connection)
{
args.UseSqlite($"{connection.Value}");
}
});
services.AddHandler<QueryContainerHandler>();
services.AddHandler<QueryLockerHandler>();
services.AddHandler<CreateItemHandler>();
services.AddHandler<UpdateItemHander>();
services.AddHandler<UpdateItemStateHandler>();
services.AddHandler<OpenContainerHandler>();
services.AddHandler<OpenLockerHandler>();
services.AddTemplate<ContainerNavigationViewModel, ContainerNavigationView>();
services.AddTemplate<LockerNavigationViewModel, LockerNavigationView>();
services.AddTemplate<AllNavigationViewModel, AllNavigationView>();
services.AddTemplate<StarredNavigationViewModel, StarredNavigationView>();
services.AddTemplate<CategoriesNavigationViewModel, CategoriesNavigationView>();
services.AddTemplate<ArchiveNavigationViewModel, ArchiveNavigationView>();
services.AddTemplate<OpenContainerViewModel, OpenView>("OpenContainer");
services.AddTemplate<OpenLockerViewModel, OpenView>("OpenLocker");
services.AddScoped<ContainerViewModelConfiguration>();
services.AddScoped<LockerViewModelConfiguration>();
services.AddTemplate<ContainerViewModel, ContainerView>("Container");
services.AddTemplate<LockerViewModel, LockerView>("Locker");
services.AddTemplate<ItemCollectionViewModel, ItemCollectionView>("ContentItemCollection");
services.AddHandler<AggerateContainerItemViewModelHandler>();
services.AddHandler<AggerateLockerItemViewModelHandler>();
services.AddTemplate<SearchContainerActionViewModel, SearchContainerActionView>();
services.AddTemplate<ContainerHeaderViewModel, ContainerHeaderView>("ContainerHeader");
services.AddTemplate<SearchLockerActionViewModel, SearchLockerActionView>();
services.AddTemplate<LockerHeaderViewModel, LockerHeaderView>("LockerHeader");
services.AddTemplate<CreateItemActionViewModel, CreateItemActionView>();
services.AddTemplate<ItemCategoryCollectionViewModel, ItemCategoryCollectionView>("ContainerItemCategoryCollection");
services.AddTemplate<ItemCategoryCollectionViewModel, ItemCategoryCollectionView>("LockerItemCategoryCollection");
services.AddTemplate<ItemCategoryNavigationViewModel, ItemCategoryNavigationView>();
services.AddHandler<AggerateContainerCategoryViewModelHandler>();
services.AddHandler<AggerateLockerCategoryViewModelHandler>();
services.AddTemplate<ItemNavigationViewModel, ItemNavigationView>();
services.AddTemplate<ItemViewModel, ItemView>("Item");
@@ -144,11 +145,11 @@ public partial class App : Application
});
})!);
services.AddTransient<IContainerFactory, ContainerFactory>();
services.AddHandler<CreateContainerHandler>();
services.AddTransient<ILockerFactory, LockerFactory>();
services.AddHandler<CreateLockerHandler>();
services.AddSingleton<IContainerHostCollection, ContainerHostCollection>();
services.AddInitializer<ContainerInitializer>();
services.AddSingleton<ILockerHostCollection, LockerHostCollection>();
services.AddInitializer<LockerInitializer>();
services.AddTemplate<MainViewModel, MainView>("Main");
services.AddHandler<AggerateMainViewModelHandler>();
@@ -158,8 +159,8 @@ public partial class App : Application
services.AddTemplate<ManageNavigationViewModel, ManageNavigationView>();
services.AddTemplate<ManageViewModel, ManageView>("Manage");
services.AddTemplate<CreateContainerNavigationViewModel, CreateContainerNavigationView>();
services.AddTemplate<CreateContainerViewModel, CreateContainerView>("CreateContainer");
services.AddTemplate<CreateLockerNavigationViewModel, CreateLockerNavigationView>();
services.AddTemplate<CreateLockerViewModel, CreateLockerView>("CreateLocker");
})
.Build();
Bitvault.Avalonia/ArchiveNavigationView.axaml
+1 -1
View File
@@ -14,7 +14,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Container">
<NavigateAction Region="Main" Route="Locker">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>
Bitvault.Avalonia/Bitvault.Avalonia.csproj
+13 -10
View File
@@ -61,11 +61,11 @@
<Compile Update="ConfirmItemActionView.axaml.cs">
<DependentUpon>ConfirmItemActionView.axaml</DependentUpon>
</Compile>
<Compile Update="CreateContainerNavigationView.axaml.cs">
<DependentUpon>CreateContainerNavigationView.axaml</DependentUpon>
<Compile Update="CreateLockerNavigationView.axaml.cs">
<DependentUpon>CreateLockerNavigationView.axaml</DependentUpon>
</Compile>
<Compile Update="CreateContainerView.axaml.cs">
<DependentUpon>CreateContainerView.axaml</DependentUpon>
<Compile Update="CreateLockerView.axaml.cs">
<DependentUpon>CreateLockerView.axaml</DependentUpon>
</Compile>
<Compile Update="DismissItemActionView.axaml.cs">
<DependentUpon>DismissItemActionView.axaml</DependentUpon>
@@ -82,8 +82,8 @@
<Compile Update="ManageNavigationView.axaml.cs">
<DependentUpon>ManageNavigationView.axaml</DependentUpon>
</Compile>
<Compile Update="ContainerHeaderView.axaml.cs">
<DependentUpon>ContainerHeaderView.axaml</DependentUpon>
<Compile Update="LockerHeaderView.axaml.cs">
<DependentUpon>LockerHeaderView.axaml</DependentUpon>
</Compile>
<Compile Update="ItemNavigationView.axaml.cs">
<DependentUpon>ItemNavigationView.axaml</DependentUpon>
@@ -91,11 +91,14 @@
<Compile Update="ItemView.axaml.cs">
<DependentUpon>ItemView.axaml</DependentUpon>
</Compile>
<Compile Update="ContainerNavigationView.axaml.cs">
<DependentUpon>ContainerNavigationView.axaml</DependentUpon>
<Compile Update="LockerNavigationView.axaml.cs">
<DependentUpon>LockerNavigationView.axaml</DependentUpon>
</Compile>
<Compile Update="ContainerView.axaml.cs">
<DependentUpon>ContainerView.axaml</DependentUpon>
<Compile Update="LockerView.axaml.cs">
<DependentUpon>LockerView.axaml</DependentUpon>
</Compile>
<Compile Update="SearchLockerActionView.axaml.cs">
<DependentUpon>SearchLockerActionView.axaml</DependentUpon>
</Compile>
</ItemGroup>
</Project>
Bitvault.Avalonia/ContainerHeaderView.axaml.cs
-8
View File
@@ -1,8 +0,0 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class ContainerHeaderView : UserControl
{
public ContainerHeaderView() => InitializeComponent();
}
Bitvault.Avalonia/ContainerNavigationView.axaml.cs
-8
View File
@@ -1,8 +0,0 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class ContainerNavigationView : NavigationViewItem
{
public ContainerNavigationView() => InitializeComponent();
}
Bitvault.Avalonia/CreateContainerNavigationView.axaml.cs
-9
View File
@@ -1,9 +0,0 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class CreateContainerNavigationView : SettingsExpander
{
public CreateContainerNavigationView() =>
InitializeComponent();
}
Bitvault.Avalonia/CreateContainerView.axaml.cs
-8
View File
@@ -1,8 +0,0 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class CreateContainerView : ContentDialog
{
public CreateContainerView() => InitializeComponent();
}
Bitvault.Avalonia/CreateItemActionView.axaml
+3 -3
View File
@@ -28,9 +28,9 @@
</Grid>
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Click">
<NavigateAction Region="Left" Route="ContainerItemCategoryCollection">
<Parameter Key="Transition" Value="FromRight" />
</NavigateAction>
<NavigateAction Region="Left" Route="LockerItemCategoryCollection">
<Parameter Key="Transition" Value="FromRight" />
</NavigateAction>
</EventTriggerBehavior>
</Interaction.Behaviors>
</Button>
Bitvault.Avalonia/CreateContainerNavigationView.axaml → Bitvault.Avalonia/CreateLockerNavigationView.axaml
+2 -2
View File
@@ -1,5 +1,5 @@
<SettingsExpander
x:Class="Bitvault.Avalonia.CreateContainerNavigationView"
x:Class="Bitvault.Avalonia.CreateLockerNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Description="Keep organized by separating your things into vaults."
@@ -8,7 +8,7 @@
<Button MinWidth="132" Content="Create vault">
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Click">
<NavigateAction Region="self" Route="CreateContainer" />
<NavigateAction Region="self" Route="CreateLocker" />
</EventTriggerBehavior>
</Interaction.Behaviors>
</Button>
Bitvault.Avalonia/CreateLockerNavigationView.axaml.cs
+9
View File
@@ -0,0 +1,9 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class CreateLockerNavigationView : SettingsExpander
{
public CreateLockerNavigationView() =>
InitializeComponent();
}
Bitvault.Avalonia/CreateContainerView.axaml → Bitvault.Avalonia/CreateLockerView.axaml
+2 -2
View File
@@ -1,10 +1,10 @@
<ContentDialog
x:Class="Bitvault.Avalonia.CreateContainerView"
x:Class="Bitvault.Avalonia.CreateLockerView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
Title="Create vault"
x:DataType="vm:CreateContainerViewModel"
x:DataType="vm:CreateLockerViewModel"
CloseButtonText="Cancel"
PrimaryButtonText="Create">
<StackPanel Width="400">
Bitvault.Avalonia/CreateLockerView.axaml.cs
+9
View File
@@ -0,0 +1,9 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class CreateLockerView : ContentDialog
{
public CreateLockerView() =>
InitializeComponent();
}
Bitvault.Avalonia/ContainerHeaderView.axaml → Bitvault.Avalonia/LockerHeaderView.axaml
+2 -2
View File
@@ -1,9 +1,9 @@
<UserControl
x:Class="Bitvault.Avalonia.ContainerHeaderView"
x:Class="Bitvault.Avalonia.LockerHeaderView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:ContainerHeaderViewModel">
x:DataType="vm:LockerHeaderViewModel">
<ItemsControl ItemTemplate="{ReflectionBinding Template}" ItemsSource="{Binding}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
Bitvault.Avalonia/LockerHeaderView.axaml.cs
+9
View File
@@ -0,0 +1,9 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class LockerHeaderView : UserControl
{
public LockerHeaderView() =>
InitializeComponent();
}
Bitvault.Avalonia/ContainerNavigationView.axaml → Bitvault.Avalonia/LockerNavigationView.axaml
+5 -5
View File
@@ -1,10 +1,10 @@
<NavigationViewItem
x:Class="Bitvault.Avalonia.ContainerNavigationView"
x:Class="Bitvault.Avalonia.LockerNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:Name="NavigationViewItem"
x:DataType="vm:ContainerNavigationViewModel"
x:DataType="vm:LockerNavigationViewModel"
Content="{Binding Name}"
IsExpanded="{Binding Expanded}"
IsSelected="{Binding Selected}"
@@ -19,7 +19,7 @@
<ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="OpenContainer" />
<NavigateAction Region="Main" Route="OpenLocker" />
<ChangePropertyAction
PropertyName="SelectsOnInvoked"
TargetObject="{Binding #NavigationViewItem}"
@@ -47,7 +47,7 @@
<ComparisonCondition LeftOperand="{Binding Opened}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="OpenContainer" />
<NavigateAction Region="Main" Route="OpenLocker" />
</ConditionAction>
<ConditionAction>
<ConditionAction.Condition>
@@ -56,7 +56,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Container" />
<NavigateAction Region="Main" Route="Locker" />
<InvokeNavigationViewItemAction />
</ConditionAction>
</AttachedEventTriggerBehaviour>
Bitvault.Avalonia/LockerNavigationView.axaml.cs
+9
View File
@@ -0,0 +1,9 @@
using Toolkit.UI.Controls.Avalonia;
namespace Bitvault.Avalonia;
public partial class LockerNavigationView : NavigationViewItem
{
public LockerNavigationView() =>
InitializeComponent();
}
Bitvault.Avalonia/ContainerView.axaml → Bitvault.Avalonia/LockerView.axaml
+3 -3
View File
@@ -1,9 +1,9 @@
<UserControl
x:Class="Bitvault.Avalonia.ContainerView"
x:Class="Bitvault.Avalonia.LockerView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:ContainerViewModel">
x:DataType="vm:LockerViewModel">
<Grid
x:Name="Container"
ColumnDefinitions="320,Auto,*,Auto"
@@ -17,7 +17,7 @@
<ContentControl VerticalAlignment="Center">
<Interaction.Behaviors>
<AttachedBehaviour>
<NavigateAction Region="{Binding $self}" Route="ContainerHeader" />
<NavigateAction Region="{Binding $self}" Route="LockerHeader" />
</AttachedBehaviour>
</Interaction.Behaviors>
</ContentControl>
Bitvault.Avalonia/ContainerView.axaml.cs → Bitvault.Avalonia/LockerView.axaml.cs
+2 -2
View File
@@ -4,9 +4,9 @@ using FluentAvalonia.UI.Windowing;
namespace Bitvault.Avalonia;
public partial class ContainerView : UserControl
public partial class LockerView : UserControl
{
public ContainerView() => InitializeComponent();
public LockerView() => InitializeComponent();
protected override void OnLoaded(RoutedEventArgs args)
{
Bitvault.Avalonia/MainView.axaml
+1 -1
View File
@@ -16,7 +16,7 @@
<Interaction.Behaviors>
<AttachedBehaviour>
<NavigateRegionAction Name="Main">
<NavigateAction Region="Main" Route="Container" />
<NavigateAction Region="Main" Route="Locker" />
</NavigateRegionAction>
</AttachedBehaviour>
</Interaction.Behaviors>
Bitvault.Avalonia/ManageNavigationView.axaml
+1 -1
View File
@@ -2,7 +2,7 @@
x:Class="Bitvault.Avalonia.ManageNavigationView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Content="Manage Vaults">
Content="Manage Lockers">
<Interaction.Behaviors>
<EventTriggerBehavior EventName="Tapped">
<NavigateAction Region="Main" Route="Manage" />
Bitvault.Avalonia/OpenView.axaml
+4 -4
View File
@@ -3,7 +3,7 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:OpenContainerViewModel">
x:DataType="vm:OpenLockerViewModel">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBox
Width="300"
@@ -11,9 +11,9 @@
PasswordChar="&#x25CF;"
Text="{Binding Password}">
<Interaction.Behaviors>
<KeyBindingTriggerBehaviour Gesture="Enter">
<InvokeCommandAction Command="{Binding InvokeCommand}" />
</KeyBindingTriggerBehaviour>
<KeyBindingTriggerBehaviour Gesture="Enter">
<InvokeCommandAction Command="{Binding InvokeCommand}" />
</KeyBindingTriggerBehaviour>
</Interaction.Behaviors>
</TextBox>
</StackPanel>
Bitvault.Avalonia/SearchContainerActionView.axaml.cs
-8
View File
@@ -1,8 +0,0 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class SearchContainerActionView : UserControl
{
public SearchContainerActionView() => InitializeComponent();
}
Bitvault.Avalonia/SearchContainerActionView.axaml → Bitvault.Avalonia/SearchLockerActionView.axaml
+2 -2
View File
@@ -1,9 +1,9 @@
<UserControl
x:Class="Bitvault.Avalonia.SearchContainerActionView"
x:Class="Bitvault.Avalonia.SearchLockerActionView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="using:Bitvault"
x:DataType="vm:SearchContainerActionViewModel">
x:DataType="vm:SearchLockerActionViewModel">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
Bitvault.Avalonia/SearchLockerActionView.axaml.cs
+9
View File
@@ -0,0 +1,9 @@
using Avalonia.Controls;
namespace Bitvault.Avalonia;
public partial class SearchLockerActionView : UserControl
{
public SearchLockerActionView() =>
InitializeComponent();
}
Bitvault.Avalonia/StarredNavigationView.axaml
+1 -1
View File
@@ -14,7 +14,7 @@
<ComparisonCondition LeftOperand="{Binding Activated}" RightOperand="False" />
</ConditionalExpression>
</ConditionAction.Condition>
<NavigateAction Region="Main" Route="Container">
<NavigateAction Region="Main" Route="Locker">
<Parameter Key="Filter" Value="{Binding Filter}" />
</NavigateAction>
</ConditionAction>