fixes
This commit is contained in:
+6
-11
@@ -2,14 +2,9 @@
|
||||
|
||||
namespace Wallet;
|
||||
|
||||
public partial class IconViewModel : Observable
|
||||
{
|
||||
public IconViewModel(IServiceProvider provider,
|
||||
IServiceFactory factory,
|
||||
IMediator mediator,
|
||||
IPublisher publisher,
|
||||
ISubscriber subscriber,
|
||||
IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
|
||||
{
|
||||
}
|
||||
}
|
||||
public partial class IconViewModel(IServiceProvider provider,
|
||||
IServiceFactory factory,
|
||||
IMediator mediator,
|
||||
IPublisher publisher,
|
||||
ISubscriber subscriber,
|
||||
IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer);
|
||||
@@ -16,13 +16,13 @@ public partial class ItemCategoryCollectionViewModel(IServiceProvider provider,
|
||||
[ObservableProperty]
|
||||
private IContentTemplate template = template;
|
||||
|
||||
public override Task Activated()
|
||||
public override Task OnActivated()
|
||||
{
|
||||
Publisher.Publish(Notify.As(Factory.Create<WalletCommandHeaderCollection>(new List<IDisposable>
|
||||
{
|
||||
Factory.Create<BackActionViewModel>(),
|
||||
})));
|
||||
|
||||
return base.Activated();
|
||||
return base.OnActivated();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,14 +59,14 @@ public partial class ItemCollectionViewModel :
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public override Task Activated()
|
||||
public override Task OnActivated()
|
||||
{
|
||||
Publisher.Publish(Notify.As(Factory.Create<WalletCommandHeaderCollection>(new List<IDisposable>
|
||||
{
|
||||
Factory.Create<SearchWalletActionViewModel>(),
|
||||
})));
|
||||
|
||||
return base.Activated();
|
||||
return base.OnActivated();
|
||||
}
|
||||
|
||||
protected override SynchronizeExpression BuildAggregateExpression() =>
|
||||
|
||||
@@ -101,7 +101,7 @@ public partial class ItemViewModel :
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
public override Task Activated()
|
||||
public override Task OnActivated()
|
||||
{
|
||||
if (Archived)
|
||||
{
|
||||
@@ -132,7 +132,7 @@ public partial class ItemViewModel :
|
||||
}
|
||||
}
|
||||
|
||||
return base.Activated();
|
||||
return base.OnActivated();
|
||||
}
|
||||
|
||||
protected override SynchronizeExpression BuildAggregateExpression() =>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using Avalonia.Xaml.Interactions.Core;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using Toolkit.Foundation;
|
||||
|
||||
namespace Wallet;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using Toolkit.Foundation;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using Toolkit.Foundation;
|
||||
|
||||
namespace Wallet;
|
||||
|
||||
@@ -9,4 +10,9 @@ public partial class ManageNavigationViewModel(IServiceProvider provider,
|
||||
ISubscriber subscriber,
|
||||
IDisposer disposer) :
|
||||
Observable(provider, factory, mediator, publisher, subscriber, disposer),
|
||||
IMainNavigationViewModel;
|
||||
IMainNavigationViewModel,
|
||||
ISelectable
|
||||
{
|
||||
[ObservableProperty]
|
||||
private bool isSelected;
|
||||
}
|
||||
@@ -49,4 +49,16 @@ public partial class OpenWalletViewModel : Observable
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override async Task OnActivated()
|
||||
{
|
||||
Publisher.Publish(Activated.As<Wallet>());
|
||||
await base.OnActivated();
|
||||
}
|
||||
|
||||
public override async Task OnDeactivated()
|
||||
{
|
||||
Publisher.Publish(Deactivated.As<Wallet>());
|
||||
await base.OnDeactivated();
|
||||
}
|
||||
}
|
||||
@@ -38,8 +38,8 @@ public class SynchronizeItemCollectionViewModelHandler(IMediator mediator,
|
||||
Item<(Guid, string)> item = new((Id, Name));
|
||||
|
||||
decoratorService.Set(item);
|
||||
|
||||
cache.Add(item);
|
||||
|
||||
publisher.Publish(Create.As(viewModel), nameof(ItemCollectionViewModel));
|
||||
}
|
||||
|
||||
|
||||
@@ -56,10 +56,10 @@ public partial class WalletNavigationViewModel :
|
||||
Add<FavouritesNavigationViewModel>("Favourites", 0);
|
||||
Add<ArchiveNavigationViewModel>("Archive", 0);
|
||||
Add<CategoriesNavigationViewModel>("Categories", 0);
|
||||
IsOpened = true;
|
||||
|
||||
Publisher.Publish(Changed.As<Item>());
|
||||
|
||||
IsOpened = true;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,15 +25,15 @@ public partial class WalletViewModel :
|
||||
Filter = filter;
|
||||
}
|
||||
|
||||
public override async Task Activated()
|
||||
public override async Task OnActivated()
|
||||
{
|
||||
Publisher.Publish(Toolkit.Foundation.Activated.As<Wallet>());
|
||||
await base.Activated();
|
||||
Publisher.Publish(Activated.As<Wallet>());
|
||||
await base.OnActivated();
|
||||
}
|
||||
|
||||
public override async Task Deactivated()
|
||||
public override async Task OnDeactivated()
|
||||
{
|
||||
Publisher.Publish(Toolkit.Foundation.Deactivated.As<Wallet>());
|
||||
await base.Deactivated();
|
||||
Publisher.Publish(Deactivated.As<Wallet>());
|
||||
await base.OnDeactivated();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user