This commit is contained in:
TheXamlGuy
2024-04-26 23:05:35 +01:00
parent aeb99c41f7
commit da60d03de3
36 changed files with 44 additions and 53 deletions
+4 -6
View File
@@ -1,10 +1,9 @@
using System;
using Avalonia;
using Avalonia;
using System;
namespace Bitvault.Avalonia.Desktop;
class Program
internal class Program
{
// Initialization code. Don't use any Avalonia, third-party APIs or any
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
@@ -19,5 +18,4 @@ class Program
.UsePlatformDetect()
.WithInterFont()
.LogToTrace();
}
}
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class AllNavigationView : NavigationViewItem
{
public AllNavigationView() => InitializeComponent();
}
}
+1 -1
View File
@@ -53,4 +53,4 @@ public partial class App : Application
await host.RunAsync();
}
}
}
+1 -1
View File
@@ -21,4 +21,4 @@ public class AppHandler(IPublisher publisher) :
}
}
}
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ArchiveNavigationView : NavigationViewItem
{
public ArchiveNavigationView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class CategoriesNavigationView : NavigationViewItem
{
public CategoriesNavigationView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class CreateVaultNavigationView : SettingsExpander
{
public CreateVaultNavigationView() => InitializeComponent();
}
}
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class CreateVaultView : ContentDialog
{
public CreateVaultView() => InitializeComponent();
}
}
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class LockView : UserControl
{
public LockView() => InitializeComponent();
}
}
+1 -2
View File
@@ -3,9 +3,8 @@ using Toolkit.Foundation;
namespace Bitvault.Avalonia;
[NavigationTarget("Main")]
public partial class MainView : UserControl
{
public MainView() => InitializeComponent();
}
}
+1 -1
View File
@@ -12,4 +12,4 @@ public partial class MainWindow : AppWindow
TitleBar.ExtendsContentIntoTitleBar = true;
TitleBar.TitleBarHitTestType = TitleBarHitTestType.Complex;
}
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ManageNavigationView : NavigationViewItem
{
public ManageNavigationView() => InitializeComponent();
}
}
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class ManageView : UserControl
{
public ManageView() => InitializeComponent();
}
}
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class StarredNavigationView : NavigationViewItem
{
public StarredNavigationView() => InitializeComponent();
}
}
+1 -1
View File
@@ -20,4 +20,4 @@ public class VaultComponent :
services.AddTemplate<VaultViewModel, VaultView>("Vault");
services.AddTemplate<LockViewModel, LockView>("Lock");
});
}
}
@@ -6,4 +6,4 @@ namespace Bitvault.Avalonia
{
public VaultNavigationView() => InitializeComponent();
}
}
}
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
public partial class VaultView : UserControl
{
public VaultView() => InitializeComponent();
}
}
+1 -1
View File
@@ -8,5 +8,5 @@ public class AllNavigationViewModel(IServiceProvider provider,
IPublisher publisher,
ISubscriber subscriber,
IDisposer disposer) :
ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer),
IMainNavigationViewModel;
+2 -2
View File
@@ -5,7 +5,7 @@ namespace Bitvault;
public partial class FooterViewModel :
ObservableCollectionViewModel<IMainNavigationViewModel>
{
public FooterViewModel(IServiceProvider provider,
public FooterViewModel(IServiceProvider provider,
IServiceFactory factory,
IMediator mediator,
IPublisher publisher,
@@ -14,4 +14,4 @@ public partial class FooterViewModel :
{
Add<ManageNavigationViewModel>();
}
}
}
+1 -1
View File
@@ -1,3 +1,3 @@
namespace Bitvault;
public interface IMainNavigationViewModel;
public interface IMainNavigationViewModel;
+1 -1
View File
@@ -2,4 +2,4 @@
namespace Bitvault;
public interface IVaultComponent : IComponent;
public interface IVaultComponent : IComponent;
+1 -1
View File
@@ -2,4 +2,4 @@
namespace Bitvault;
public interface IVaultHost : IComponentHost;
public interface IVaultHost : IComponentHost;
+1 -1
View File
@@ -6,4 +6,4 @@ public interface IVaultHostCollection :
IEnumerable<IComponentHost>
{
void Add(IComponentHost host);
}
}
+1 -1
View File
@@ -1,3 +1,3 @@
namespace Bitvault;
public record Locked;
public record Locked;
+2 -2
View File
@@ -4,7 +4,7 @@ using Toolkit.Foundation;
namespace Bitvault;
[Notification(nameof(MainViewModel))]
public partial class MainViewModel :
public partial class MainViewModel :
ObservableCollectionViewModel<IMainNavigationViewModel>
{
[ObservableProperty]
@@ -24,4 +24,4 @@ public partial class MainViewModel :
}
public IContentTemplate Template { get; set; }
}
}
+5 -6
View File
@@ -2,17 +2,16 @@
namespace Bitvault;
public partial class ManageNavigationViewModel :
ObservableViewModel,
public partial class ManageNavigationViewModel :
ObservableViewModel,
IMainNavigationViewModel
{
public ManageNavigationViewModel(IServiceProvider provider,
IServiceFactory factory,
IMediator mediator,
IPublisher publisher,
ISubscriber subscriber,
IPublisher publisher,
ISubscriber subscriber,
IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
{
}
}
}
+1 -2
View File
@@ -1,5 +1,4 @@
using Avalonia.Styling;
using Toolkit.Foundation;
using Toolkit.Foundation;
namespace Bitvault;
+1 -1
View File
@@ -1,3 +1,3 @@
namespace Bitvault;
public class SystemIdleTimer;
public class SystemIdleTimer;
+1 -1
View File
@@ -1,3 +1,3 @@
namespace Bitvault;
public record Vault(string Name);
public record Vault(string Name);
+1 -1
View File
@@ -5,4 +5,4 @@ namespace Bitvault;
public record VaultConfiguration : ComponentConfiguration
{
public string? Name { get; set; }
}
}
+1 -1
View File
@@ -50,4 +50,4 @@ public class VaultFactory(IServiceProvider provider,
return default;
}
}
}
+1 -2
View File
@@ -2,7 +2,6 @@
namespace Bitvault;
public class VaultStorageHandler :
INotificationHandler<Create<VaultStorage>>
{
@@ -18,7 +17,7 @@ public record VaultStorage(string Name);
public class VaultHandler(IVaultFactory factory) :
IHandler<Create<Vault>, bool>
{
//public async Task Handle(Create<Vault> args,
//public async Task Handle(Create<Vault> args,
// CancellationToken cancellationToken = default)
//{
// if (args.Value is Vault vault)
+1 -1
View File
@@ -16,4 +16,4 @@ public class VaultHostCollection :
IEnumerator IEnumerable.GetEnumerator() =>
hosts.GetEnumerator();
}
}
-3
View File
@@ -26,8 +26,6 @@ public partial class VaultNavigationViewModel :
{
Template = template;
Name = name;
}
public IContentTemplate Template { get; set; }
@@ -42,7 +40,6 @@ public partial class VaultNavigationViewModel :
Add<CategoriesNavigationViewModel>();
return Task.CompletedTask;
}
public Task Handle(Locked args, CancellationToken cancellationToken = default)
+1 -1
View File
@@ -25,4 +25,4 @@ public class VaultNavigationViewModelHandler(IPublisher publisher,
}
}
}
}
}
+1 -1
View File
@@ -8,4 +8,4 @@ public class VaultViewModel(IServiceProvider provider,
IPublisher publisher,
ISubscriber subscriber,
IDisposer disposer) :
ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);
ObservableViewModel(provider, factory, mediator, publisher, subscriber, disposer);