From 61213b00e757f2b0b2c80add8c74d68d5692082d Mon Sep 17 00:00:00 2001 From: TheXamlGuy Date: Sat, 15 Jun 2024 14:24:30 +0100 Subject: [PATCH] Tidy --- Wallet.Avalonia/App.axaml.cs | 2 +- ...onView.axaml => FavouritesNavigationView.axaml} | 6 +++--- Wallet.Avalonia/FavouritesNavigationView.axaml.cs | 9 +++++++++ Wallet.Avalonia/StarredNavigationView.axaml.cs | 8 -------- Wallet.Avalonia/Wallet.Avalonia.csproj | 3 +++ Wallet/ArchiveItemHandler.cs | 2 +- Wallet/ArchiveNavigationViewModel.cs | 14 +------------- Wallet/CountCategoriesHandler.cs | 5 ++--- Wallet/CreateItemViewModelHandler.cs | 2 +- Wallet/FavouriteItemHandler.cs | 2 +- ...ewModel.cs => FavouritesNavigationViewModel.cs} | 7 ++----- Wallet/ItemChangedHandler.cs | 8 ++++---- Wallet/UnarchiveItemHandler.cs | 2 +- Wallet/UnfavouriteItemHandler.cs | 2 +- Wallet/WalletNavigationViewModel.cs | 4 +++- 15 files changed, 33 insertions(+), 43 deletions(-) rename Wallet.Avalonia/{StarredNavigationView.axaml => FavouritesNavigationView.axaml} (93%) create mode 100644 Wallet.Avalonia/FavouritesNavigationView.axaml.cs delete mode 100644 Wallet.Avalonia/StarredNavigationView.axaml.cs rename Wallet/{StarredNavigationViewModel.cs => FavouritesNavigationViewModel.cs} (65%) diff --git a/Wallet.Avalonia/App.axaml.cs b/Wallet.Avalonia/App.axaml.cs index 76be6e6..8d2a5e3 100644 --- a/Wallet.Avalonia/App.axaml.cs +++ b/Wallet.Avalonia/App.axaml.cs @@ -113,7 +113,7 @@ public partial class App : Application services.AddTemplate(); services.AddTemplate(); - services.AddTemplate(); + services.AddTemplate(); services.AddTemplate(); services.AddTemplate(); services.AddTemplate(); diff --git a/Wallet.Avalonia/StarredNavigationView.axaml b/Wallet.Avalonia/FavouritesNavigationView.axaml similarity index 93% rename from Wallet.Avalonia/StarredNavigationView.axaml rename to Wallet.Avalonia/FavouritesNavigationView.axaml index ce76d48..219f8a1 100644 --- a/Wallet.Avalonia/StarredNavigationView.axaml +++ b/Wallet.Avalonia/FavouritesNavigationView.axaml @@ -1,10 +1,10 @@ diff --git a/Wallet.Avalonia/FavouritesNavigationView.axaml.cs b/Wallet.Avalonia/FavouritesNavigationView.axaml.cs new file mode 100644 index 0000000..f9367f3 --- /dev/null +++ b/Wallet.Avalonia/FavouritesNavigationView.axaml.cs @@ -0,0 +1,9 @@ +using Toolkit.UI.Controls.Avalonia; + +namespace Wallet.Avalonia; + +public partial class FavouritesNavigationView : + NavigationViewItem +{ + public FavouritesNavigationView() => InitializeComponent(); +} \ No newline at end of file diff --git a/Wallet.Avalonia/StarredNavigationView.axaml.cs b/Wallet.Avalonia/StarredNavigationView.axaml.cs deleted file mode 100644 index 1b5f130..0000000 --- a/Wallet.Avalonia/StarredNavigationView.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Toolkit.UI.Controls.Avalonia; - -namespace Wallet.Avalonia; - -public partial class StarredNavigationView : NavigationViewItem -{ - public StarredNavigationView() => InitializeComponent(); -} \ No newline at end of file diff --git a/Wallet.Avalonia/Wallet.Avalonia.csproj b/Wallet.Avalonia/Wallet.Avalonia.csproj index b419693..bb94d59 100644 --- a/Wallet.Avalonia/Wallet.Avalonia.csproj +++ b/Wallet.Avalonia/Wallet.Avalonia.csproj @@ -76,6 +76,9 @@ ItemContentView.axaml + + FavouritesNavigationView.axaml + TextEntryView.axaml diff --git a/Wallet/ArchiveItemHandler.cs b/Wallet/ArchiveItemHandler.cs index 7e6a4ca..c94906b 100644 --- a/Wallet/ArchiveItemHandler.cs +++ b/Wallet/ArchiveItemHandler.cs @@ -22,7 +22,7 @@ public class ArchiveItemHandler(IDecoratorService> decorato bool>(new UpdateEventArgs<(Guid, int)>((id, 2))); cache.Remove(item); - publisher.Publish(Changed.As(item)); + publisher.Publish(Changed.As()); } } } diff --git a/Wallet/ArchiveNavigationViewModel.cs b/Wallet/ArchiveNavigationViewModel.cs index aeacf6d..4abf0aa 100644 --- a/Wallet/ArchiveNavigationViewModel.cs +++ b/Wallet/ArchiveNavigationViewModel.cs @@ -2,7 +2,6 @@ namespace Wallet; -[Notification(typeof(NotifyEventArgs>), "Archive")] public partial class ArchiveNavigationViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, @@ -11,15 +10,4 @@ public partial class ArchiveNavigationViewModel(IServiceProvider provider, IDisposer disposer, int key, string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value), - INotificationHandler>> -{ - public Task Handle(NotifyEventArgs> args) - { - if (args.Sender is Item item) - { - Key = item.Value; - } - - return Task.CompletedTask; - } -} \ No newline at end of file + INotificationHandler>>; \ No newline at end of file diff --git a/Wallet/CountCategoriesHandler.cs b/Wallet/CountCategoriesHandler.cs index 46dfa59..439db04 100644 --- a/Wallet/CountCategoriesHandler.cs +++ b/Wallet/CountCategoriesHandler.cs @@ -1,14 +1,13 @@ using Microsoft.EntityFrameworkCore; -using System.Linq; using Toolkit.Foundation; using Wallet.Data; namespace Wallet; public class CountCategoriesHandler(IDbContextFactory dbContextFactory) : - IHandler, IReadOnlyCollection<(string, int)>> + IHandler, IReadOnlyCollection<(string, int)>> { - public async Task> Handle(CountEventArgs args, + public async Task> Handle(CountEventArgs args, CancellationToken cancellationToken) { using WalletContext context = await dbContextFactory.CreateDbContextAsync(cancellationToken); diff --git a/Wallet/CreateItemViewModelHandler.cs b/Wallet/CreateItemViewModelHandler.cs index 2373fc7..7ba9ec3 100644 --- a/Wallet/CreateItemViewModelHandler.cs +++ b/Wallet/CreateItemViewModelHandler.cs @@ -29,7 +29,7 @@ public class CreateItemViewModelHandler(IServiceFactory serviceFactory, itemHeaderConfigurationDecorator.Set(configuration); - if (serviceFactory.Create(args.Parameters) is ItemViewModel itemViewModel) + if (serviceFactory.Create(args => args.Initialize(), args.Parameters) is ItemViewModel itemViewModel) { itemViewModel.Add(configuration, state, "", name); itemViewModel.Add(); diff --git a/Wallet/FavouriteItemHandler.cs b/Wallet/FavouriteItemHandler.cs index 6723c91..6f2fce1 100644 --- a/Wallet/FavouriteItemHandler.cs +++ b/Wallet/FavouriteItemHandler.cs @@ -16,7 +16,7 @@ public class FavouriteItemHandler(IDecoratorService> decora (Guid id, string name) = item.Value; await mediator.Handle, bool>(new UpdateEventArgs<(Guid, int)>((id, 1))); - publisher.Publish(Changed.As(item)); + publisher.Publish(Changed.As()); } } catch diff --git a/Wallet/StarredNavigationViewModel.cs b/Wallet/FavouritesNavigationViewModel.cs similarity index 65% rename from Wallet/StarredNavigationViewModel.cs rename to Wallet/FavouritesNavigationViewModel.cs index 3820f34..babf508 100644 --- a/Wallet/StarredNavigationViewModel.cs +++ b/Wallet/FavouritesNavigationViewModel.cs @@ -2,14 +2,11 @@ namespace Wallet; -public partial class StarredNavigationViewModel(IServiceProvider provider, +public partial class FavouritesNavigationViewModel(IServiceProvider provider, IServiceFactory factory, IMediator mediator, IPublisher publisher, ISubscriber subscriber, IDisposer disposer, int key, - string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value) -{ - -} \ No newline at end of file + string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value); \ No newline at end of file diff --git a/Wallet/ItemChangedHandler.cs b/Wallet/ItemChangedHandler.cs index 213093c..8d9b9c9 100644 --- a/Wallet/ItemChangedHandler.cs +++ b/Wallet/ItemChangedHandler.cs @@ -4,12 +4,12 @@ namespace Wallet; public class ItemChangedHandler(IMediator mediator, IPublisher publisher) : - INotificationHandler>> + INotificationHandler> { - public async Task Handle(ChangedEventArgs> args) + public async Task Handle(ChangedEventArgs args) { - IReadOnlyCollection<(string, int)>? categoryCounts = await mediator.Handle, - IReadOnlyCollection<(string, int)>>(Count.As()); + IReadOnlyCollection<(string, int)>? categoryCounts = await mediator.Handle, + IReadOnlyCollection<(string, int)>>(Count.As()); if (categoryCounts is { Count: > 0 } ) { diff --git a/Wallet/UnarchiveItemHandler.cs b/Wallet/UnarchiveItemHandler.cs index f0febe2..9b20248 100644 --- a/Wallet/UnarchiveItemHandler.cs +++ b/Wallet/UnarchiveItemHandler.cs @@ -20,7 +20,7 @@ public class UnarchiveItemHandler(IDecoratorService> decora bool>(new UpdateEventArgs<(Guid, int)>((id, 0))); cache.Add(item); - publisher.Publish(Changed.As(item)); + publisher.Publish(Changed.As()); } } catch diff --git a/Wallet/UnfavouriteItemHandler.cs b/Wallet/UnfavouriteItemHandler.cs index 876d417..b14b297 100644 --- a/Wallet/UnfavouriteItemHandler.cs +++ b/Wallet/UnfavouriteItemHandler.cs @@ -16,7 +16,7 @@ public class UnfavouriteItemHandler(IDecoratorService> deco (Guid id, string name) = item.Value; await mediator.Handle, bool>(new UpdateEventArgs<(Guid, int)>((id, 0))); - publisher.Publish(Changed.As(item)); + publisher.Publish(Changed.As()); } } catch diff --git a/Wallet/WalletNavigationViewModel.cs b/Wallet/WalletNavigationViewModel.cs index eea310c..324eb6b 100644 --- a/Wallet/WalletNavigationViewModel.cs +++ b/Wallet/WalletNavigationViewModel.cs @@ -47,10 +47,12 @@ public partial class WalletNavigationViewModel : public Task Handle(OpenedEventArgs args) { Add("All", 0); - Add("Starred", 0); + Add("Favourites", 0); Add("Archive", 0); Add("Categories", 0); + Publisher.Publish(Changed.As()); + Opened = true; return Task.CompletedTask; }