Natlinux/Apollon
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "impliment NavigateService"

Browse Source 
This reverts commit 439850b5b7.
This commit is contained in:
Natlinux
2022-11-27 13:18:15 +01:00
parent 439850b5b7
commit a2c926f915
7 changed files with 19 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Apollon.WPF/Commands/AddTournamentCommand.cs
View File

@@ -1,5 +1,4 @@
using Apollon.Domain.Models;
using Apollon.WPF.Services;
using Apollon.WPF.Stores;
using Apollon.WPF.ViewModels;
using System;
@@ -13,23 +12,19 @@ namespace Apollon.WPF.Commands
public class AddTournamentCommand : AsyncCommandBase
{
private readonly TournamentsStore _tournamentStore;
private readonly NavigationService<PreparationViewModel> _navigationService;
private readonly NavigationStore _navigationStore;
private readonly ModalNavigationStore _modalNavigationStore;
private readonly SelectedTournamentsStore _selectedTournamentsStore;
private AddTournamentViewModel _addTournamentViewModel;
public AddTournamentCommand(AddTournamentViewModel addTournamentViewModel, NavigationService<PreparationViewModel> navigationService)
{
}
public AddTournamentCommand(TournamentsStore tournamentStore, NavigationService<PreparationViewModel> navigationService, ModalNavigationStore modalNavigationStore,
SelectedTournamentsStore selectedTournamentsStore, AddTournamentViewModel addTournamentViewModel)
public AddTournamentCommand(AddTournamentViewModel addTournamentViewModel, TournamentsStore tournamentStore, ModalNavigationStore modalNavigationStore, NavigationStore navigationStore, SelectedTournamentsStore selectedTournamentsStore)
{
_tournamentStore = tournamentStore;
_navigationService = navigationService;
_modalNavigationStore = modalNavigationStore;
_selectedTournamentsStore = selectedTournamentsStore;
_addTournamentViewModel = addTournamentViewModel;
_tournamentStore = tournamentStore;
_modalNavigationStore = modalNavigationStore;
_navigationStore = navigationStore;
_selectedTournamentsStore = selectedTournamentsStore;
}
public override async Task ExecuteAsync(object parameter)
@@ -57,7 +52,7 @@ namespace Apollon.WPF.Commands
await _tournamentStore.Add(tournament);
_modalNavigationStore.Close();
_navigationService.Navigate();
_navigationStore.CurrentViewModel = new PreparationViewModel(_selectedTournamentsStore, _navigationStore, _modalNavigationStore, _tournamentStore);
}
catch (Exception)

15
Apollon.WPF/Commands/NavigateCommand.cs
View File

@@ -1,5 +1,4 @@
using Apollon.WPF.Services;
using Apollon.WPF.Stores;
using Apollon.WPF.Stores;
using Apollon.WPF.ViewModels;
using System;
using System.Collections.Generic;
@@ -12,16 +11,18 @@ namespace Apollon.WPF.Commands
public class NavigateCommand<TViewModel> : CommandBase
where TViewModel : ViewModelBase
{
private readonly NavigationService<TViewModel> _navigationService;
private readonly NavigationStore _navigationStore;
private readonly Func<TViewModel> _createViewModel;
public NavigateCommand(NavigationService<TViewModel> navigationService)
public NavigateCommand(NavigationStore navigationStore, Func<TViewModel> createViewModel)
{
_navigationService = navigationService;
_navigationStore = navigationStore;
_createViewModel = createViewModel;
}
public override void Execute(object parameter)
{
_navigationService.Navigate();
{
_navigationStore.CurrentViewModel = _createViewModel();
}
}
}