From da60d03de379bcebdc2ab67043f46bf336808e98 Mon Sep 17 00:00:00 2001 From: TheXamlGuy Date: Fri, 26 Apr 2024 23:05:35 +0100 Subject: [PATCH] tidy --- Bitvault.Avalonia.Desktop/Program.cs | 10 ++++------ Bitvault.Avalonia/AllNavigationView.axaml.cs | 2 +- Bitvault.Avalonia/App.axaml.cs | 2 +- Bitvault.Avalonia/AppHandler.cs | 2 +- Bitvault.Avalonia/ArchiveNavigationView.axaml.cs | 2 +- Bitvault.Avalonia/CategoriesNavigationView.axaml.cs | 2 +- Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs | 2 +- Bitvault.Avalonia/CreateVaultView.axaml.cs | 2 +- Bitvault.Avalonia/LockView.axaml.cs | 2 +- Bitvault.Avalonia/MainView.axaml.cs | 3 +-- Bitvault.Avalonia/MainWindow.axaml.cs | 2 +- Bitvault.Avalonia/ManageNavigationView.axaml.cs | 2 +- Bitvault.Avalonia/ManageView.axaml.cs | 2 +- Bitvault.Avalonia/StarredNavigationView.axaml.cs | 2 +- Bitvault.Avalonia/VaultComponent.cs | 2 +- Bitvault.Avalonia/VaultNavigationView.axaml.cs | 2 +- Bitvault.Avalonia/VaultView.axaml.cs | 2 +- Bitvault/AllNavigationViewModel.cs | 2 +- Bitvault/FooterViewModel.cs | 4 ++-- Bitvault/IMainNavigationViewModel.cs | 2 +- Bitvault/IVaultComponent.cs | 2 +- Bitvault/IVaultHost.cs | 2 +- Bitvault/IVaultHostCollection.cs | 2 +- Bitvault/Locked.cs | 2 +- Bitvault/MainViewModel.cs | 4 ++-- Bitvault/ManageNavigationViewModel.cs | 11 +++++------ Bitvault/ManageViewModel.cs | 3 +-- Bitvault/SystemIdleTimer.cs | 2 +- Bitvault/Vault.cs | 2 +- Bitvault/VaultConfiguration.cs | 2 +- Bitvault/VaultFactory.cs | 2 +- Bitvault/VaultHandler.cs | 3 +-- Bitvault/VaultHostCollection.cs | 2 +- Bitvault/VaultNavigationViewModel.cs | 3 --- Bitvault/VaultNavigationViewModelHandler.cs | 2 +- Bitvault/VaultViewModel.cs | 2 +- 36 files changed, 44 insertions(+), 53 deletions(-) diff --git a/Bitvault.Avalonia.Desktop/Program.cs b/Bitvault.Avalonia.Desktop/Program.cs index ebf5af0..b5edbd6 100644 --- a/Bitvault.Avalonia.Desktop/Program.cs +++ b/Bitvault.Avalonia.Desktop/Program.cs @@ -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(); - -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/AllNavigationView.axaml.cs b/Bitvault.Avalonia/AllNavigationView.axaml.cs index df03d16..76a874f 100644 --- a/Bitvault.Avalonia/AllNavigationView.axaml.cs +++ b/Bitvault.Avalonia/AllNavigationView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class AllNavigationView : NavigationViewItem { public AllNavigationView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/App.axaml.cs b/Bitvault.Avalonia/App.axaml.cs index e2d2bf1..493e07b 100644 --- a/Bitvault.Avalonia/App.axaml.cs +++ b/Bitvault.Avalonia/App.axaml.cs @@ -53,4 +53,4 @@ public partial class App : Application await host.RunAsync(); } -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/AppHandler.cs b/Bitvault.Avalonia/AppHandler.cs index 68195a7..cc0fe7c 100644 --- a/Bitvault.Avalonia/AppHandler.cs +++ b/Bitvault.Avalonia/AppHandler.cs @@ -21,4 +21,4 @@ public class AppHandler(IPublisher publisher) : } } } -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/ArchiveNavigationView.axaml.cs b/Bitvault.Avalonia/ArchiveNavigationView.axaml.cs index 68ef7db..2ce946d 100644 --- a/Bitvault.Avalonia/ArchiveNavigationView.axaml.cs +++ b/Bitvault.Avalonia/ArchiveNavigationView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class ArchiveNavigationView : NavigationViewItem { public ArchiveNavigationView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/CategoriesNavigationView.axaml.cs b/Bitvault.Avalonia/CategoriesNavigationView.axaml.cs index 7e55540..4590361 100644 --- a/Bitvault.Avalonia/CategoriesNavigationView.axaml.cs +++ b/Bitvault.Avalonia/CategoriesNavigationView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class CategoriesNavigationView : NavigationViewItem { public CategoriesNavigationView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs b/Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs index 1be9f78..c83e7e7 100644 --- a/Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs +++ b/Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class CreateVaultNavigationView : SettingsExpander { public CreateVaultNavigationView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/CreateVaultView.axaml.cs b/Bitvault.Avalonia/CreateVaultView.axaml.cs index aa428d4..2e366ac 100644 --- a/Bitvault.Avalonia/CreateVaultView.axaml.cs +++ b/Bitvault.Avalonia/CreateVaultView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class CreateVaultView : ContentDialog { public CreateVaultView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/LockView.axaml.cs b/Bitvault.Avalonia/LockView.axaml.cs index 487033b..b54fa07 100644 --- a/Bitvault.Avalonia/LockView.axaml.cs +++ b/Bitvault.Avalonia/LockView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class LockView : UserControl { public LockView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/MainView.axaml.cs b/Bitvault.Avalonia/MainView.axaml.cs index 428c4e8..8a558c0 100644 --- a/Bitvault.Avalonia/MainView.axaml.cs +++ b/Bitvault.Avalonia/MainView.axaml.cs @@ -3,9 +3,8 @@ using Toolkit.Foundation; namespace Bitvault.Avalonia; - [NavigationTarget("Main")] public partial class MainView : UserControl { public MainView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/MainWindow.axaml.cs b/Bitvault.Avalonia/MainWindow.axaml.cs index 5d5e479..6bac412 100644 --- a/Bitvault.Avalonia/MainWindow.axaml.cs +++ b/Bitvault.Avalonia/MainWindow.axaml.cs @@ -12,4 +12,4 @@ public partial class MainWindow : AppWindow TitleBar.ExtendsContentIntoTitleBar = true; TitleBar.TitleBarHitTestType = TitleBarHitTestType.Complex; } -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/ManageNavigationView.axaml.cs b/Bitvault.Avalonia/ManageNavigationView.axaml.cs index 1822850..b20d040 100644 --- a/Bitvault.Avalonia/ManageNavigationView.axaml.cs +++ b/Bitvault.Avalonia/ManageNavigationView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class ManageNavigationView : NavigationViewItem { public ManageNavigationView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/ManageView.axaml.cs b/Bitvault.Avalonia/ManageView.axaml.cs index 852e0f1..9af58b2 100644 --- a/Bitvault.Avalonia/ManageView.axaml.cs +++ b/Bitvault.Avalonia/ManageView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class ManageView : UserControl { public ManageView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/StarredNavigationView.axaml.cs b/Bitvault.Avalonia/StarredNavigationView.axaml.cs index d691a85..63ea538 100644 --- a/Bitvault.Avalonia/StarredNavigationView.axaml.cs +++ b/Bitvault.Avalonia/StarredNavigationView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class StarredNavigationView : NavigationViewItem { public StarredNavigationView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/VaultComponent.cs b/Bitvault.Avalonia/VaultComponent.cs index 777aeef..e913a4e 100644 --- a/Bitvault.Avalonia/VaultComponent.cs +++ b/Bitvault.Avalonia/VaultComponent.cs @@ -20,4 +20,4 @@ public class VaultComponent : services.AddTemplate("Vault"); services.AddTemplate("Lock"); }); -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/VaultNavigationView.axaml.cs b/Bitvault.Avalonia/VaultNavigationView.axaml.cs index fce2ec4..834b136 100644 --- a/Bitvault.Avalonia/VaultNavigationView.axaml.cs +++ b/Bitvault.Avalonia/VaultNavigationView.axaml.cs @@ -6,4 +6,4 @@ namespace Bitvault.Avalonia { public VaultNavigationView() => InitializeComponent(); } -} +} \ No newline at end of file diff --git a/Bitvault.Avalonia/VaultView.axaml.cs b/Bitvault.Avalonia/VaultView.axaml.cs index b4119f2..6411dbd 100644 --- a/Bitvault.Avalonia/VaultView.axaml.cs +++ b/Bitvault.Avalonia/VaultView.axaml.cs @@ -5,4 +5,4 @@ namespace Bitvault.Avalonia; public partial class VaultView : UserControl { public VaultView() => InitializeComponent(); -} +} \ No newline at end of file diff --git a/Bitvault/AllNavigationViewModel.cs b/Bitvault/AllNavigationViewModel.cs index 9868e21..99ade27 100644 --- a/Bitvault/AllNavigationViewModel.cs +++ b/Bitvault/AllNavigationViewModel.cs @@ -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; \ No newline at end of file diff --git a/Bitvault/FooterViewModel.cs b/Bitvault/FooterViewModel.cs index 288b575..b791698 100644 --- a/Bitvault/FooterViewModel.cs +++ b/Bitvault/FooterViewModel.cs @@ -5,7 +5,7 @@ namespace Bitvault; public partial class FooterViewModel : ObservableCollectionViewModel { - public FooterViewModel(IServiceProvider provider, + public FooterViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, IPublisher publisher, @@ -14,4 +14,4 @@ public partial class FooterViewModel : { Add(); } -} +} \ No newline at end of file diff --git a/Bitvault/IMainNavigationViewModel.cs b/Bitvault/IMainNavigationViewModel.cs index 4f58127..0835c19 100644 --- a/Bitvault/IMainNavigationViewModel.cs +++ b/Bitvault/IMainNavigationViewModel.cs @@ -1,3 +1,3 @@ namespace Bitvault; -public interface IMainNavigationViewModel; +public interface IMainNavigationViewModel; \ No newline at end of file diff --git a/Bitvault/IVaultComponent.cs b/Bitvault/IVaultComponent.cs index 1642023..fe61a2d 100644 --- a/Bitvault/IVaultComponent.cs +++ b/Bitvault/IVaultComponent.cs @@ -2,4 +2,4 @@ namespace Bitvault; -public interface IVaultComponent : IComponent; +public interface IVaultComponent : IComponent; \ No newline at end of file diff --git a/Bitvault/IVaultHost.cs b/Bitvault/IVaultHost.cs index 951d535..4694865 100644 --- a/Bitvault/IVaultHost.cs +++ b/Bitvault/IVaultHost.cs @@ -2,4 +2,4 @@ namespace Bitvault; -public interface IVaultHost : IComponentHost; +public interface IVaultHost : IComponentHost; \ No newline at end of file diff --git a/Bitvault/IVaultHostCollection.cs b/Bitvault/IVaultHostCollection.cs index f8593b4..c49ff10 100644 --- a/Bitvault/IVaultHostCollection.cs +++ b/Bitvault/IVaultHostCollection.cs @@ -6,4 +6,4 @@ public interface IVaultHostCollection : IEnumerable { void Add(IComponentHost host); -} +} \ No newline at end of file diff --git a/Bitvault/Locked.cs b/Bitvault/Locked.cs index 072760e..79802a6 100644 --- a/Bitvault/Locked.cs +++ b/Bitvault/Locked.cs @@ -1,3 +1,3 @@ namespace Bitvault; -public record Locked; +public record Locked; \ No newline at end of file diff --git a/Bitvault/MainViewModel.cs b/Bitvault/MainViewModel.cs index 8df8027..b0c86f3 100644 --- a/Bitvault/MainViewModel.cs +++ b/Bitvault/MainViewModel.cs @@ -4,7 +4,7 @@ using Toolkit.Foundation; namespace Bitvault; [Notification(nameof(MainViewModel))] -public partial class MainViewModel : +public partial class MainViewModel : ObservableCollectionViewModel { [ObservableProperty] @@ -24,4 +24,4 @@ public partial class MainViewModel : } public IContentTemplate Template { get; set; } -} +} \ No newline at end of file diff --git a/Bitvault/ManageNavigationViewModel.cs b/Bitvault/ManageNavigationViewModel.cs index 2b37f73..471caf5 100644 --- a/Bitvault/ManageNavigationViewModel.cs +++ b/Bitvault/ManageNavigationViewModel.cs @@ -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) { - } -} +} \ No newline at end of file diff --git a/Bitvault/ManageViewModel.cs b/Bitvault/ManageViewModel.cs index a4d9311..ced1f64 100644 --- a/Bitvault/ManageViewModel.cs +++ b/Bitvault/ManageViewModel.cs @@ -1,5 +1,4 @@ -using Avalonia.Styling; -using Toolkit.Foundation; +using Toolkit.Foundation; namespace Bitvault; diff --git a/Bitvault/SystemIdleTimer.cs b/Bitvault/SystemIdleTimer.cs index dcd2861..9565e78 100644 --- a/Bitvault/SystemIdleTimer.cs +++ b/Bitvault/SystemIdleTimer.cs @@ -1,3 +1,3 @@ namespace Bitvault; -public class SystemIdleTimer; +public class SystemIdleTimer; \ No newline at end of file diff --git a/Bitvault/Vault.cs b/Bitvault/Vault.cs index aabd844..a07a23c 100644 --- a/Bitvault/Vault.cs +++ b/Bitvault/Vault.cs @@ -1,3 +1,3 @@ namespace Bitvault; -public record Vault(string Name); +public record Vault(string Name); \ No newline at end of file diff --git a/Bitvault/VaultConfiguration.cs b/Bitvault/VaultConfiguration.cs index b8ecf7d..03149b0 100644 --- a/Bitvault/VaultConfiguration.cs +++ b/Bitvault/VaultConfiguration.cs @@ -5,4 +5,4 @@ namespace Bitvault; public record VaultConfiguration : ComponentConfiguration { public string? Name { get; set; } -} +} \ No newline at end of file diff --git a/Bitvault/VaultFactory.cs b/Bitvault/VaultFactory.cs index c488520..8443910 100644 --- a/Bitvault/VaultFactory.cs +++ b/Bitvault/VaultFactory.cs @@ -50,4 +50,4 @@ public class VaultFactory(IServiceProvider provider, return default; } -} +} \ No newline at end of file diff --git a/Bitvault/VaultHandler.cs b/Bitvault/VaultHandler.cs index b09ad82..6a67bd5 100644 --- a/Bitvault/VaultHandler.cs +++ b/Bitvault/VaultHandler.cs @@ -2,7 +2,6 @@ namespace Bitvault; - public class VaultStorageHandler : INotificationHandler> { @@ -18,7 +17,7 @@ public record VaultStorage(string Name); public class VaultHandler(IVaultFactory factory) : IHandler, bool> { - //public async Task Handle(Create args, + //public async Task Handle(Create args, // CancellationToken cancellationToken = default) //{ // if (args.Value is Vault vault) diff --git a/Bitvault/VaultHostCollection.cs b/Bitvault/VaultHostCollection.cs index 27baace..4465cee 100644 --- a/Bitvault/VaultHostCollection.cs +++ b/Bitvault/VaultHostCollection.cs @@ -16,4 +16,4 @@ public class VaultHostCollection : IEnumerator IEnumerable.GetEnumerator() => hosts.GetEnumerator(); -} +} \ No newline at end of file diff --git a/Bitvault/VaultNavigationViewModel.cs b/Bitvault/VaultNavigationViewModel.cs index e5b7414..13d49c9 100644 --- a/Bitvault/VaultNavigationViewModel.cs +++ b/Bitvault/VaultNavigationViewModel.cs @@ -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(); return Task.CompletedTask; - } public Task Handle(Locked args, CancellationToken cancellationToken = default) diff --git a/Bitvault/VaultNavigationViewModelHandler.cs b/Bitvault/VaultNavigationViewModelHandler.cs index 58fb3ed..31c61f7 100644 --- a/Bitvault/VaultNavigationViewModelHandler.cs +++ b/Bitvault/VaultNavigationViewModelHandler.cs @@ -25,4 +25,4 @@ public class VaultNavigationViewModelHandler(IPublisher publisher, } } } -} +} \ No newline at end of file diff --git a/Bitvault/VaultViewModel.cs b/Bitvault/VaultViewModel.cs index 81bac04..bf00c75 100644 --- a/Bitvault/VaultViewModel.cs +++ b/Bitvault/VaultViewModel.cs @@ -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); \ No newline at end of file