tidy

Bitvault.Avalonia.Desktop/Program.cs

@@ -1,10 +1,9 @@
-using System;
+using Avalonia;
-
+using System;
-using Avalonia;
 
 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();
-
+}
-}

Bitvault.Avalonia/AllNavigationView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class AllNavigationView : NavigationViewItem
 {
     public AllNavigationView() => InitializeComponent();
-}
+}

Bitvault.Avalonia/App.axaml.cs

@@ -53,4 +53,4 @@ public partial class App : Application
 
         await host.RunAsync();
     }
-}
+}

Bitvault.Avalonia/AppHandler.cs

@@ -21,4 +21,4 @@ public class AppHandler(IPublisher publisher) :
             }
         }
     }
-}
+}

Bitvault.Avalonia/ArchiveNavigationView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ArchiveNavigationView : NavigationViewItem
 {
     public ArchiveNavigationView() => InitializeComponent();
-}
+}

Bitvault.Avalonia/CategoriesNavigationView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class CategoriesNavigationView : NavigationViewItem
 {
     public CategoriesNavigationView() => InitializeComponent();
-}
+}

Bitvault.Avalonia/CreateVaultNavigationView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class CreateVaultNavigationView : SettingsExpander
 {
     public CreateVaultNavigationView() => InitializeComponent();
-}
+}

Bitvault.Avalonia/CreateVaultView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class CreateVaultView : ContentDialog
 {
     public CreateVaultView() => InitializeComponent();
-}
+}

Bitvault.Avalonia/LockView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class LockView : UserControl
 {
     public LockView() => InitializeComponent();
-}
+}

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();
-}
+}

Bitvault.Avalonia/MainWindow.axaml.cs

@@ -12,4 +12,4 @@ public partial class MainWindow : AppWindow
         TitleBar.ExtendsContentIntoTitleBar = true;
         TitleBar.TitleBarHitTestType = TitleBarHitTestType.Complex;
     }
-}
+}

Bitvault.Avalonia/ManageNavigationView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ManageNavigationView : NavigationViewItem
 {
     public ManageNavigationView() => InitializeComponent();
-}
+}

Bitvault.Avalonia/ManageView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class ManageView : UserControl
 {
     public ManageView() => InitializeComponent();
-}
+}

Bitvault.Avalonia/StarredNavigationView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class StarredNavigationView : NavigationViewItem
 {
     public StarredNavigationView() => InitializeComponent();
-}
+}

Bitvault.Avalonia/VaultComponent.cs

@@ -20,4 +20,4 @@ public class VaultComponent :
                 services.AddTemplate<VaultViewModel, VaultView>("Vault");
                 services.AddTemplate<LockViewModel, LockView>("Lock");
             });
-}
+}

Bitvault.Avalonia/VaultNavigationView.axaml.cs

@@ -6,4 +6,4 @@ namespace Bitvault.Avalonia
     {
         public VaultNavigationView() => InitializeComponent();
     }
-}
+}

Bitvault.Avalonia/VaultView.axaml.cs

@@ -5,4 +5,4 @@ namespace Bitvault.Avalonia;
 public partial class VaultView : UserControl
 {
     public VaultView() => InitializeComponent();
-}
+}

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;

Bitvault/FooterViewModel.cs

@@ -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>();
     }
-}
+}

Bitvault/IMainNavigationViewModel.cs

@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public interface IMainNavigationViewModel;
+public interface IMainNavigationViewModel;

Bitvault/IVaultComponent.cs

@@ -2,4 +2,4 @@
 
 namespace Bitvault;
 
-public interface IVaultComponent : IComponent;
+public interface IVaultComponent : IComponent;

Bitvault/IVaultHost.cs

@@ -2,4 +2,4 @@
 
 namespace Bitvault;
 
-public interface IVaultHost : IComponentHost;
+public interface IVaultHost : IComponentHost;

Bitvault/IVaultHostCollection.cs

@@ -6,4 +6,4 @@ public interface IVaultHostCollection :
     IEnumerable<IComponentHost>
 {
     void Add(IComponentHost host);
-}
+}

Bitvault/Locked.cs

@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record Locked;
+public record Locked;

Bitvault/MainViewModel.cs

@@ -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; }
-}
+}

Bitvault/ManageNavigationViewModel.cs

@@ -2,17 +2,16 @@
 
 namespace Bitvault;
 
-public partial class ManageNavigationViewModel : 
+public partial class ManageNavigationViewModel :
-    ObservableViewModel, 
+    ObservableViewModel,
     IMainNavigationViewModel
 {
     public ManageNavigationViewModel(IServiceProvider provider,
         IServiceFactory factory,
         IMediator mediator,
-        IPublisher publisher, 
+        IPublisher publisher,
-        ISubscriber subscriber, 
+        ISubscriber subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
-
     }
-}
+}

Bitvault/ManageViewModel.cs

@@ -1,5 +1,4 @@
-using Avalonia.Styling;
+using Toolkit.Foundation;
-using Toolkit.Foundation;
 
 namespace Bitvault;
 

Bitvault/SystemIdleTimer.cs

@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public class SystemIdleTimer;
+public class SystemIdleTimer;

Bitvault/Vault.cs

@@ -1,3 +1,3 @@
 namespace Bitvault;
 
-public record Vault(string Name);
+public record Vault(string Name);

Bitvault/VaultConfiguration.cs

@@ -5,4 +5,4 @@ namespace Bitvault;
 public record VaultConfiguration : ComponentConfiguration
 {
     public string? Name { get; set; }
-}
+}

Bitvault/VaultFactory.cs

@@ -50,4 +50,4 @@ public class VaultFactory(IServiceProvider provider,
 
         return default;
     }
-}
+}

Bitvault/VaultHandler.cs

@@ -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)

Bitvault/VaultHostCollection.cs

@@ -16,4 +16,4 @@ public class VaultHostCollection :
 
     IEnumerator IEnumerable.GetEnumerator() =>
         hosts.GetEnumerator();
-}
+}

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<CategoriesNavigationViewModel>();
 
         return Task.CompletedTask;
-
     }
 
     public Task Handle(Locked args, CancellationToken cancellationToken = default)

Bitvault/VaultNavigationViewModelHandler.cs

@@ -25,4 +25,4 @@ public class VaultNavigationViewModelHandler(IPublisher publisher,
             }
         }
     }
-}
+}

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);