All VMs use viewmodellocator

2025-10-03 15:40:18 -04:00 · 2020-04-25 22:03:47 +02:00
parent df973c5f62
commit 7778e45deb
12 changed files with 79 additions and 142 deletions
--- a/ModernKeePass/ViewModels/EntryDetailVm.cs
+++ b/ModernKeePass/ViewModels/EntryDetailVm.cs
@@ -9,7 +9,6 @@ using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.Views;
 using MediatR;
-using Microsoft.Extensions.DependencyInjection;
 using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Application.Database.Commands.SaveDatabase;
 using ModernKeePass.Application.Database.Models;
@@ -58,7 +57,7 @@ namespace ModernKeePass.ViewModels
        } 

        public IEnumerable<GroupVm> BreadCrumb => new List<GroupVm> { _parent };
-        public ObservableCollection<EntryVm> History { get; }
+        public ObservableCollection<EntryVm> History { get; private set; }

        /// <summary>
        /// Determines if the Entry is current or from history
@@ -230,38 +229,21 @@ namespace ModernKeePass.ViewModels
        private readonly IResourceProxy _resource;
        private readonly IDialogService _dialog;
        private readonly INotificationService _notification;
-        private readonly GroupVm _parent;
+        private GroupVm _parent;
        private EntryVm _selectedItem;
        private int _selectedIndex;
        private bool _isEditMode;
        private bool _isRevealPassword;
        private double _passwordLength = 25;
        private bool _isDirty;
-
-        public EntryDetailVm() { }
        
-        internal EntryDetailVm(string entryId) : this(entryId, 
-            App.Services.GetRequiredService<IMediator>(), 
-            App.Services.GetRequiredService<INavigationService>(), 
-            App.Services.GetRequiredService<IResourceProxy>(), 
-            App.Services.GetRequiredService<IDialogService>(), 
-            App.Services.GetRequiredService<INotificationService>()) { }
-
-        public EntryDetailVm(string entryId, IMediator mediator, INavigationService navigation, IResourceProxy resource, IDialogService dialog, INotificationService notification)
+        public EntryDetailVm(IMediator mediator, INavigationService navigation, IResourceProxy resource, IDialogService dialog, INotificationService notification)
        {
            _mediator = mediator;
            _navigation = navigation;
            _resource = resource;
            _dialog = dialog;
            _notification = notification;
-            SelectedItem = _mediator.Send(new GetEntryQuery { Id = entryId }).GetAwaiter().GetResult();
-            _parent = _mediator.Send(new GetGroupQuery { Id = SelectedItem.ParentGroupId }).GetAwaiter().GetResult();
-            History = new ObservableCollection<EntryVm> { SelectedItem };
-            foreach (var entry in SelectedItem.History.Skip(1))
-            {
-                History.Add(entry);
-            }
-            SelectedIndex = 0;

            SaveCommand = new RelayCommand(async () => await SaveChanges(), () => Database.IsDirty);
            GeneratePasswordCommand = new RelayCommand(async () => await GeneratePassword());
@@ -271,6 +253,18 @@ namespace ModernKeePass.ViewModels
            GoBackCommand = new RelayCommand(() => _navigation.GoBack());
        }

+        public async Task Initialize(string entryId)
+        {
+            SelectedItem = await _mediator.Send(new GetEntryQuery { Id = entryId });
+            _parent = await _mediator.Send(new GetGroupQuery { Id = SelectedItem.ParentGroupId });
+            History = new ObservableCollection<EntryVm> { SelectedItem };
+            foreach (var entry in SelectedItem.History.Skip(1))
+            {
+                History.Add(entry);
+            }
+            SelectedIndex = 0;
+        }
+
        private async Task AskForDelete()
        {
            if (IsCurrentEntry)
--- a/ModernKeePass/ViewModels/GroupDetailVm.cs
+++ b/ModernKeePass/ViewModels/GroupDetailVm.cs
@@ -9,7 +9,6 @@ using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using GalaSoft.MvvmLight.Views;
 using MediatR;
-using Microsoft.Extensions.DependencyInjection;
 using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Application.Database.Commands.SaveDatabase;
 using ModernKeePass.Application.Database.Models;
@@ -36,9 +35,9 @@ namespace ModernKeePass.ViewModels
 {
    public class GroupDetailVm : ObservableObject
    {
-        public ObservableCollection<EntryVm> Entries { get; }
+        public ObservableCollection<EntryVm> Entries { get; private set; }

-        public ObservableCollection<GroupVm> Groups { get; }
+        public ObservableCollection<GroupVm> Groups { get; private set; }
        
        public bool IsNotRoot => Database.RootGroupId != _group.Id;

@@ -84,7 +83,7 @@ namespace ModernKeePass.ViewModels

        public bool IsInRecycleBin => _parent != null && _parent.Id == Database.RecycleBinId;

-        public IEnumerable<GroupVm> BreadCrumb { get; }
+        public IEnumerable<GroupVm> BreadCrumb { get; private set; }

        public RelayCommand SaveCommand { get; }
        public RelayCommand SortEntriesCommand { get; }
@@ -102,34 +101,18 @@ namespace ModernKeePass.ViewModels
        private readonly INavigationService _navigation;
        private readonly IDialogService _dialog;
        private readonly INotificationService _notification;
-        private readonly GroupVm _group;
-        private readonly GroupVm _parent;
+        private GroupVm _group;
+        private GroupVm _parent;
        private bool _isEditMode;
        private EntryVm _reorderedEntry;
-
-        public GroupDetailVm() {}
        
-        internal GroupDetailVm(string groupId) : this(groupId, 
-            App.Services.GetRequiredService<IMediator>(), 
-            App.Services.GetRequiredService<IResourceProxy>(), 
-            App.Services.GetRequiredService<INavigationService>(), 
-            App.Services.GetRequiredService<IDialogService>(), 
-            App.Services.GetRequiredService<INotificationService>())
-        { }
-
-        public GroupDetailVm(string groupId, IMediator mediator, IResourceProxy resource, INavigationService navigation, IDialogService dialog, INotificationService notification)
+        public GroupDetailVm(IMediator mediator, IResourceProxy resource, INavigationService navigation, IDialogService dialog, INotificationService notification)
        {
            _mediator = mediator;
            _resource = resource;
            _navigation = navigation;
            _dialog = dialog;
            _notification = notification;
-            _group = _mediator.Send(new GetGroupQuery { Id = groupId }).GetAwaiter().GetResult();
-            if (!string.IsNullOrEmpty(_group.ParentGroupId))
-            {
-                _parent = _mediator.Send(new GetGroupQuery { Id = _group.ParentGroupId }).GetAwaiter().GetResult();
-                BreadCrumb = new List<GroupVm> {_parent};
-            }

            SaveCommand = new RelayCommand(async () => await SaveChanges(), () => Database.IsDirty);
            SortEntriesCommand = new RelayCommand(async () => await SortEntriesAsync(), () => IsEditMode);
@@ -139,32 +122,22 @@ namespace ModernKeePass.ViewModels
            CreateGroupCommand = new RelayCommand(async () => await AddNewGroup(), () => !IsInRecycleBin && Database.RecycleBinId != Id);
            DeleteCommand = new RelayCommand(async () => await AskForDelete());
            GoBackCommand = new RelayCommand(() => _navigation.GoBack());
+        }
+
+        public async Task Initialize(string groupId)
+        {
+            _group = await _mediator.Send(new GetGroupQuery { Id = groupId });
+            if (!string.IsNullOrEmpty(_group.ParentGroupId))
+            {
+                _parent = await _mediator.Send(new GetGroupQuery { Id = _group.ParentGroupId });
+                BreadCrumb = new List<GroupVm> { _parent };
+            }

            Entries = new ObservableCollection<EntryVm>(_group.Entries);
            Entries.CollectionChanged += Entries_CollectionChanged;
            Groups = new ObservableCollection<GroupVm>(_group.SubGroups);
        }
-
-        private async Task AskForDelete()
-        {
-            if (IsRecycleOnDelete)
-            {
-                await Delete();
-                _notification.Show(_resource.GetResourceValue("GroupRecyclingConfirmation"), _resource.GetResourceValue("GroupRecycled"));
-            }
-            else
-            {
-                await _dialog.ShowMessage(_resource.GetResourceValue("GroupDeletingConfirmation"), _resource.GetResourceValue("EntityDeleteTitle"),
-                _resource.GetResourceValue("EntityDeleteActionButton"),
-                _resource.GetResourceValue("EntityDeleteCancelButton"),
-                async isOk =>
-                {
-                    if (isOk) await Delete();
-                });
-            }
-        }
-
-
+        
        public async Task AddNewGroup(string name = "")
        {
            var group = await _mediator.Send(new CreateGroupCommand {Name = name, ParentGroup = _group});
@@ -239,6 +212,25 @@ namespace ModernKeePass.ViewModels
            SaveCommand.RaiseCanExecuteChanged();
        }

+        private async Task AskForDelete()
+        {
+            if (IsRecycleOnDelete)
+            {
+                await Delete();
+                _notification.Show(_resource.GetResourceValue("GroupRecyclingConfirmation"), _resource.GetResourceValue("GroupRecycled"));
+            }
+            else
+            {
+                await _dialog.ShowMessage(_resource.GetResourceValue("GroupDeletingConfirmation"), _resource.GetResourceValue("EntityDeleteTitle"),
+                    _resource.GetResourceValue("EntityDeleteActionButton"),
+                    _resource.GetResourceValue("EntityDeleteCancelButton"),
+                    async isOk =>
+                    {
+                        if (isOk) await Delete();
+                    });
+            }
+        }
+
        private async Task Delete()
        {
            await _mediator.Send(new DeleteGroupCommand
--- a/ModernKeePass/ViewModels/MainVm.cs
+++ b/ModernKeePass/ViewModels/MainVm.cs
@@ -5,7 +5,6 @@ using Windows.UI.Xaml.Controls;
 using GalaSoft.MvvmLight;
 using MediatR;
 using Messages;
-using Microsoft.Extensions.DependencyInjection;
 using ModernKeePass.Application.Common.Interfaces;
 using ModernKeePass.Application.Database.Queries.GetDatabase;
 using ModernKeePass.Domain.Dtos;
@@ -61,30 +60,13 @@ namespace ModernKeePass.ViewModels
            }
        }

-        public MainVm() {}
-
-        internal MainVm(Frame referenceFrame, Frame destinationFrame, FileInfo databaseFile = null) : this(
-            referenceFrame, 
-            destinationFrame,
-            App.Services.GetRequiredService<IMediator>(), 
-            App.Services.GetRequiredService<IRecentProxy>(), 
-            App.Services.GetRequiredService<IResourceProxy>(),
-            App.Services.GetRequiredService<IDialogService>(),
-            App.Services.GetRequiredService<INotificationService>(), 
-            App.Services.GetRequiredService<INavigationService>(), 
-            databaseFile)
-        { }
-
        public MainVm(
-            Frame referenceFrame, 
-            Frame destinationFrame, 
            IMediator mediator, 
            IRecentProxy recent, 
            IResourceProxy resource, 
            IDialogService dialog,
            INotificationService notification,
-            INavigationService navigation,
-            FileInfo databaseFile = null)
+            INavigationService navigation)
        {
            _mediator = mediator;
            _recent = recent;
@@ -92,16 +74,14 @@ namespace ModernKeePass.ViewModels
            _dialog = dialog;
            _notification = notification;
            _navigation = navigation;
-
-            BuildMainMenuItems(referenceFrame, destinationFrame, databaseFile);
-
+            
            MessengerInstance.Register<DatabaseOpenedMessage>(this, NavigateToPage);
            MessengerInstance.Register<DatabaseAlreadyOpenedMessage>(this, async message => await DisplaySaveConfirmation(message));
        }

-        private void BuildMainMenuItems(Frame referenceFrame, Frame destinationFrame, FileInfo databaseFile)
+        public async Task Initialize(Frame referenceFrame, Frame destinationFrame, FileInfo databaseFile = null)
        {
-            var database = _mediator.Send(new GetDatabaseQuery()).GetAwaiter().GetResult();
+            var database = await _mediator.Send(new GetDatabaseQuery());
            var mainMenuItems = new ObservableCollection<MainMenuItemVm>
            {
                new MainMenuItemVm