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

Navigation Service and Cleanup UI

Browse Source
This commit is contained in:
Natlinux
2022-11-27 21:52:18 +01:00
parent 3911dd66e8
commit 56a433876e
14 changed files with 441 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
Apollon.WPF/MainWindow.xaml
View File

@@ -49,6 +49,12 @@
<DataTemplate DataType="{x:Type vms:GroupsViewModel}"> <DataTemplate DataType="{x:Type vms:GroupsViewModel}">
<views:GroupsView/> <views:GroupsView/>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="{x:Type vms:ClassesViewModel}">
<views:ClassesView/>
</DataTemplate>
<DataTemplate DataType="{x:Type vms:ArchersViewModel}">
<views:ArchersView/>
</DataTemplate>
<DataTemplate DataType="{x:Type vms:NameListViewModel}"> <DataTemplate DataType="{x:Type vms:NameListViewModel}">
<views:RootdatesView/> <views:RootdatesView/>
</DataTemplate> </DataTemplate>

28
Apollon.WPF/Services/NavigationService.cs Normal file
View File

@@ -0,0 +1,28 @@
using Apollon.WPF.Stores;
using Apollon.WPF.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Apollon.WPF.Services
{
public class NavigationService<TViewModel>
where TViewModel : ViewModelBase
{
private readonly NavigationStore _navigationStore;
private readonly Func<TViewModel> _createViewModel;
public NavigationService(NavigationStore navigationStore, Func<TViewModel> createViewModel)
{
_navigationStore = navigationStore;
_createViewModel = createViewModel;
}
public void Navigate()
{
_navigationStore.CurrentViewModel = _createViewModel();
}
}
}

6
Apollon.WPF/ViewModels/ArchersViewModel.cs
View File

@@ -8,5 +8,11 @@ namespace Apollon.WPF.ViewModels
{ {
public class ArchersViewModel : ViewModelBase public class ArchersViewModel : ViewModelBase
{ {
public NavBarPreparationViewModel NavBarPreparationViewModel { get; }
public ArchersViewModel(NavBarPreparationViewModel navBarPreparationViewModel)
{
NavBarPreparationViewModel = navBarPreparationViewModel;
}
} }
} }

6
Apollon.WPF/ViewModels/ClassesViewModel.cs
View File

@@ -8,5 +8,11 @@ namespace Apollon.WPF.ViewModels
{ {
public class ClassesViewModel : ViewModelBase public class ClassesViewModel : ViewModelBase
{ {
public NavBarPreparationViewModel NavBarPreparationViewModel { get; }
public ClassesViewModel(NavBarPreparationViewModel navBarPreparationViewModel)
{
NavBarPreparationViewModel = navBarPreparationViewModel;
}
} }
} }

4
Apollon.WPF/ViewModels/GroupsViewModel.cs
View File

@@ -1,5 +1,6 @@
using Apollon.Domain.Models; using Apollon.Domain.Models;
using Apollon.WPF.Commands; using Apollon.WPF.Commands;
using Apollon.WPF.Services;
using Apollon.WPF.Stores; using Apollon.WPF.Stores;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -14,13 +15,14 @@ namespace Apollon.WPF.ViewModels
{ {
public TournamentDetailsViewModel TournamentDetailsViewModel { get; } public TournamentDetailsViewModel TournamentDetailsViewModel { get; }
public NavBarPreparationViewModel NavBarPreparationViewModel { get; }
public ICommand NavigateOverviewCommand { get; } public ICommand NavigateOverviewCommand { get; }
public GroupsViewModel(SelectedTournamentsStore selectedTournamentStore, NavigationStore navigationStore, ModalNavigationStore modalNavigationStore, TournamentsStore tournamentsStore) public GroupsViewModel(SelectedTournamentsStore selectedTournamentStore, NavigationStore navigationStore, ModalNavigationStore modalNavigationStore, TournamentsStore tournamentsStore)
{ {
TournamentDetailsViewModel = new TournamentDetailsViewModel(selectedTournamentStore); TournamentDetailsViewModel = new TournamentDetailsViewModel(selectedTournamentStore);
NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(navigationStore, () => OverviewViewModel.LoadViewModel(selectedTournamentStore, modalNavigationStore, tournamentsStore, navigationStore)); NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(new NavigationService<OverviewViewModel>(navigationStore, () => OverviewViewModel.LoadViewModel(selectedTournamentStore, modalNavigationStore, tournamentsStore, navigationStore)));
} }
} }
} }

10
Apollon.WPF/ViewModels/NavBarPreparationViewModel.cs
View File

@@ -1,4 +1,5 @@
using Apollon.WPF.Commands; using Apollon.WPF.Commands;
using Apollon.WPF.Services;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -14,5 +15,14 @@ namespace Apollon.WPF.ViewModels
public ICommand NavigateGroupsCommand { get;} public ICommand NavigateGroupsCommand { get;}
public ICommand NavigateClassesCommand { get;} public ICommand NavigateClassesCommand { get;}
public ICommand NavigateArchersCommand { get;} public ICommand NavigateArchersCommand { get;}
public NavBarPreparationViewModel(NavigationService<OverviewViewModel> overviewNavigationService, NavigationService<GroupsViewModel> groupNavigationService,
NavigationService<ClassesViewModel> classNavigationService, NavigationService<ArchersViewModel> archersNavigationService)
{
NavigateOverviewCommand = new NavigateCommand<OverviewViewModel>(overviewNavigationService);
NavigateGroupsCommand = new NavigateCommand<GroupsViewModel>(groupNavigationService);
NavigateClassesCommand = new NavigateCommand<ClassesViewModel>(classNavigationService);
NavigateArchersCommand = new NavigateCommand<ArchersViewModel>(archersNavigationService);
}
} }
} }

4
Apollon.WPF/ViewModels/OverviewDetailsViewModel.cs
View File

@@ -1,5 +1,6 @@
using Apollon.Domain.Models; using Apollon.Domain.Models;
using Apollon.WPF.Commands; using Apollon.WPF.Commands;
using Apollon.WPF.Services;
using Apollon.WPF.Stores; using Apollon.WPF.Stores;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -35,7 +36,8 @@ namespace Apollon.WPF.ViewModels
_selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged; _selectedTournamentStore.SelectedTournamentChanged += SelectedTournamentStore_SelectedTournamentChanged;
NavigatePreparationCommand = new NavigateCommand<GroupsViewModel>(navigationStore, () => new GroupsViewModel(selectedTournamentStore, navigationStore, modalNavigationStore, tournamentsStore)); NavigatePreparationCommand = new NavigateCommand<GroupsViewModel>(new NavigationService<GroupsViewModel> (
navigationStore, () => new GroupsViewModel( _selectedTournamentStore, navigationStore, modalNavigationStore, tournamentsStore)));
} }
protected override void Dispose() protected override void Dispose()

10
Apollon.WPF/ViewModels/OverviewViewModel.cs
View File

@@ -1,12 +1,7 @@
using Apollon.WPF.Commands; using Apollon.WPF.Commands;
using Apollon.Domain.Models;
using Apollon.WPF.Stores; using Apollon.WPF.Stores;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
using Apollon.WPF.Services;
namespace Apollon.WPF.ViewModels namespace Apollon.WPF.ViewModels
{ {
@@ -58,7 +53,8 @@ namespace Apollon.WPF.ViewModels
LoadTournamentsCommand = new LoadTournamentsCommand(this, tournamentStore); LoadTournamentsCommand = new LoadTournamentsCommand(this, tournamentStore);
OpenAddTournamentCommand = new OpenAddTournamentCommand(tournamentStore, modalNavigationStore, navigationStore, selectedTournamentStore); OpenAddTournamentCommand = new OpenAddTournamentCommand(tournamentStore, modalNavigationStore, navigationStore, selectedTournamentStore);
NavigateNameListCommand = new NavigateCommand<NameListViewModel>(navigationStore, () => new NameListViewModel()); NavigateNameListCommand = new NavigateCommand<NameListViewModel>(new NavigationService<NameListViewModel>(
navigationStore, () => new NameListViewModel()));
} }

21
Apollon.WPF/Views/ArchersView.xaml
View File

@@ -3,10 +3,25 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Apollon.WPF.Views" xmlns:local="clr-namespace:Apollon.WPF.Views" xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="680" d:DesignWidth="1100">
<Grid> <Grid Margin="15, 35">
<Grid.RowDefinitions>
<RowDefinition Height="80"/>
<RowDefinition Height="550"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border BorderThickness="2" BorderBrush="{StaticResource BrushPrimary1}"
Grid.Row="1" Grid.Column="1"
CornerRadius="5">
<TextBlock Text="Teilnehmer" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="Teilnehmer" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<components:TournamentDetails Grid.Column="1" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
<components:NavBarPreparationView Grid.RowSpan="2" DataContext="{Binding NavBarPreparationViewModel}"/>
</Grid> </Grid>
</UserControl> </UserControl>

21
Apollon.WPF/Views/ClassesView.xaml
View File

@@ -4,9 +4,26 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Apollon.WPF.Views" xmlns:local="clr-namespace:Apollon.WPF.Views"
xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="680" d:DesignWidth="1100">
<Grid> <Grid Margin="1535">
<Grid.RowDefinitions>
<RowDefinition Height="80"/>
<RowDefinition Height="550"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250"/>
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border BorderThickness="2" BorderBrush="{StaticResource BrushPrimary1}"
Grid.Row="1" Grid.Column="1"
CornerRadius="5">
<TextBlock Text="Klassen" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="Klassen" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border>
<components:TournamentDetails Grid.Column="1" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
<components:NavBarPreparationView Grid.RowSpan="2" DataContext="{Binding NavBarPreparationViewModel}"/>
</Grid> </Grid>
</UserControl> </UserControl>

32
Apollon.WPF/Views/Components/NavBarPreparationView.xaml
View File

@@ -6,8 +6,12 @@
xmlns:local="clr-namespace:Apollon.WPF.Views.Components" xmlns:local="clr-namespace:Apollon.WPF.Views.Components"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="680" d:DesignWidth="1100">
<Grid> <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="80"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<StackPanel> <StackPanel>
<Button Width="35" <Button Width="35"
Height="35" Height="35"
@@ -19,9 +23,19 @@
Width="35" Width="35"
Foreground="#0000a0"/> Foreground="#0000a0"/>
</Button> </Button>
<Menu Height="450"
<TextBlock Text="Vorbereitung"
Foreground="#0000a0"
FontFamily="Arial"
FontWeight="Bold"
FontSize="24"
HorizontalAlignment="Center"
Margin="0 15"/>
</StackPanel>
<Menu Height="350"
Background="Transparent" Background="Transparent"
Margin="0,20,0,0"> Grid.Row="1"
Margin=" 0 40">
<Menu.ItemsPanel> <Menu.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<VirtualizingStackPanel Orientation="Vertical"/> <VirtualizingStackPanel Orientation="Vertical"/>
@@ -35,7 +49,7 @@
FontSize="16" FontSize="16"
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="0 40"> Margin="0 20">
<MenuItem.Icon> <MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="BowArrow" <iconPacks:PackIconMaterial Kind="BowArrow"
Height="20" Height="20"
@@ -45,7 +59,8 @@
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
</MenuItem.Icon> </MenuItem.Icon>
<MenuItem Header="Gruppen" <MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}"> Template="{StaticResource Item_Template}"
Command="{Binding NavigateGroupsCommand}">
<MenuItem.Icon> <MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="AccountMultiple" <iconPacks:PackIconMaterial Kind="AccountMultiple"
Height="20" Height="20"
@@ -56,7 +71,8 @@
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<MenuItem Header="Klassen" <MenuItem Header="Klassen"
Template="{StaticResource Item_Template}"> Template="{StaticResource Item_Template}"
Command="{Binding NavigateClassesCommand}">
<MenuItem.Icon> <MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="ArrowProjectileMultiple" <iconPacks:PackIconMaterial Kind="ArrowProjectileMultiple"
Height="20" Height="20"
@@ -78,7 +94,8 @@
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<MenuItem Header="Teilnehmer setzen" <MenuItem Header="Teilnehmer setzen"
Template="{StaticResource Item_Template}"> Template="{StaticResource Item_Template}"
Command="{Binding NavigateArchersCommand}">
<MenuItem.Icon> <MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="ArrowProjectile" <iconPacks:PackIconMaterial Kind="ArrowProjectile"
Height="20" Height="20"
@@ -374,6 +391,5 @@
</MenuItem> </MenuItem>
</MenuItem> </MenuItem>
</Menu> </Menu>
</StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

8
Apollon.WPF/Views/Components/TournamentDetails.xaml
View File

@@ -5,8 +5,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Apollon.WPF.Views.Components" xmlns:local="clr-namespace:Apollon.WPF.Views.Components"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="100" d:DesignWidth="800"> d:DesignHeight="680" d:DesignWidth="1100">
<Grid> <Grid Height="80">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition Width="600"/> <ColumnDefinition Width="600"/>
@@ -14,7 +14,8 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image Grid.Column="0" <Image Grid.Column="0"
Source="{Binding Logo}" Source="{Binding Logo}"
Width="80" Width="70"
Height="70"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<StackPanel Grid.Column="1"> <StackPanel Grid.Column="1">
<WrapPanel HorizontalAlignment="Center"> <WrapPanel HorizontalAlignment="Center">
@@ -81,6 +82,7 @@
<Image Grid.Column="2" <Image Grid.Column="2"
Source="{Binding CompetitionImage}" Source="{Binding CompetitionImage}"
Width="70" Width="70"
Height="70"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
</Grid> </Grid>
</UserControl> </UserControl>

31
Apollon.WPF/Views/GroupsView.xaml
View File

@@ -4,33 +4,24 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:components="clr-namespace:Apollon.WPF.Views.Components" xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:local="clr-namespace:Apollon.WPF.Views"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"> d:DesignHeight="680" d:DesignWidth="1100">
<Grid Margin="15,35">
<Grid Margin="20" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="120"/> <RowDefinition Height="80"/>
<RowDefinition Height="*"/> <RowDefinition Height="550"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="250"/> <ColumnDefinition Width="250"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.Column="2" Grid.Row="2" <Border BorderThickness="2" BorderBrush="{StaticResource BrushPrimary1}"
BorderBrush="#0000a0" Grid.Row="1" Grid.Column="1"
BorderThickness="1" CornerRadius="5">
CornerRadius="2"> <TextBlock Text="Groups" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="Gruppen" />
<!--<TextBlock Text="{Binding Groups}"/>-->
</StackPanel>
</Border> </Border>
<components:TournamentDetails Grid.Column="1" Margin="0,35,0,10" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/> <components:TournamentDetails Grid.Column="1" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
<components:NavBarPreparationView Grid.Row="1" Margin="0 ,0 ,2, 30"/> <components:NavBarPreparationView Grid.RowSpan="2" DataContext="{Binding NavBarPreparationViewModel}"/>
</Grid> </Grid>
</UserControl> </UserControl>