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

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

@@ -3,10 +3,25 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
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"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<TextBlock Text="Teilnehmer" VerticalAlignment="Center" HorizontalAlignment="Center"/>
d:DesignHeight="680" d:DesignWidth="1100">
<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"/>
</Border>
<components:TournamentDetails Grid.Column="1" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
<components:NavBarPreparationView Grid.RowSpan="2" DataContext="{Binding NavBarPreparationViewModel}"/>
</Grid>
</UserControl>

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

@@ -4,9 +4,26 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Apollon.WPF.Views"
xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<TextBlock Text="Klassen" VerticalAlignment="Center" HorizontalAlignment="Center"/>
d:DesignHeight="680" d:DesignWidth="1100">
<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"/>
</Border>
<components:TournamentDetails Grid.Column="1" HorizontalAlignment="Center" DataContext="{Binding TournamentDetailsViewModel}"/>
<components:NavBarPreparationView Grid.RowSpan="2" DataContext="{Binding NavBarPreparationViewModel}"/>
</Grid>
</UserControl>

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

@@ -6,8 +6,12 @@
xmlns:local="clr-namespace:Apollon.WPF.Views.Components"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
d:DesignHeight="680" d:DesignWidth="1100">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="80"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<StackPanel>
<Button Width="35"
Height="35"
@@ -19,15 +23,25 @@
Width="35"
Foreground="#0000a0"/>
</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"
Margin="0,20,0,0">
<Menu.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel Orientation="Vertical"/>
</ItemsPanelTemplate>
</Menu.ItemsPanel>
<MenuItem Header="Turnierdaten"
Grid.Row="1"
Margin=" 0 40">
<Menu.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel Orientation="Vertical"/>
</ItemsPanelTemplate>
</Menu.ItemsPanel>
<MenuItem Header="Turnierdaten"
Template="{StaticResource Menu_SubMenu_Template}"
Foreground="#0000a0"
FontFamily="Arial"
@@ -35,61 +49,64 @@
FontSize="16"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="0 40">
Margin="0 20">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="BowArrow"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}"
Command="{Binding NavigateGroupsCommand}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="BowArrow"
<iconPacks:PackIconMaterial Kind="AccountMultiple"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="AccountMultiple"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Klassen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="ArrowProjectileMultiple"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Namenliste"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="BadgeAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Teilnehmer setzen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="ArrowProjectile"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Daten"
<MenuItem Header="Klassen"
Template="{StaticResource Item_Template}"
Command="{Binding NavigateClassesCommand}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="ArrowProjectileMultiple"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Namenliste"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="BadgeAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Teilnehmer setzen"
Template="{StaticResource Item_Template}"
Command="{Binding NavigateArchersCommand}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="ArrowProjectile"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Daten"
Template="{StaticResource Menu_SubMenu_Template }"
Foreground="#0000a0"
FontFamily="Arial"
@@ -98,6 +115,16 @@
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="0 10">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
@@ -106,85 +133,75 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Berichte"
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Berichte"
Template="{StaticResource Menu_SubMenu_Template }"
Foreground="#0000a0"
FontFamily="Arial"
@@ -192,6 +209,16 @@
FontSize="16"
VerticalAlignment="Center"
HorizontalAlignment="Center">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
@@ -200,85 +227,75 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Klassenprüfung"
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem Header="Klassenprüfung"
Template="{StaticResource Menu_SubMenu_Template }"
Foreground="#0000a0"
FontFamily="Arial"
@@ -287,6 +304,16 @@
VerticalAlignment="Center"
HorizontalAlignment="Center"
Margin="0 40">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
@@ -295,85 +322,74 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
</Menu>
</StackPanel>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Gruppen"
Template="{StaticResource Item_Template}">
<MenuItem.Icon>
<iconPacks:PackIconMaterial Kind="FileAccount"
Height="20"
Width="20"
Foreground="#0000a0"
HorizontalAlignment="Center"
VerticalAlignment="Center"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
</Menu>
</Grid>
</UserControl>

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

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

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

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