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

Finish LoadingSpinner

Browse Source
This commit is contained in:
Natlinux81
2022-08-28 01:58:33 +02:00
parent 7fe2fd08ea
commit dfe0f72d04
20 changed files with 181 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Apollon.WPF/Views/Components/AddEditDetails.xaml
View File

@@ -3,7 +3,8 @@
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.Components"
xmlns:local="clr-namespace:Apollon.WPF.Views.Components"
xmlns:custom="clr-namespace:LoadingSpinnerControl;assembly=LoadingSpinnerControl"
mc:Ignorable="d">
<Grid>
<Grid.RowDefinitions>
@@ -133,6 +134,7 @@
HorizontalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="35"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
@@ -150,7 +152,12 @@
Width="120"
Height="35"
FontSize="16"
Grid.Column="1"/>
Grid.Column="2"/>
<custom:LoadingSpinner Grid.Column="1"
Diameter="25"
Thickness="2"
Color="{StaticResource BrushPrimary1}"
IsLoading="{Binding IsSubmitting}"/>
</Grid>
</Grid>
</UserControl>

10
Apollon.WPF/Views/Components/OverViewListing.xaml
View File

@@ -65,15 +65,11 @@
Grid.Column="1"
Foreground="Red"/>
</Button>
</WrapPanel>
</Grid>
</WrapPanel>
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</Border>
</Border>
</Grid>
</UserControl>

90
Apollon.WPF/Views/OverviewView.xaml
View File

@@ -4,7 +4,8 @@
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"
xmlns:components="clr-namespace:Apollon.WPF.Views.Components"
xmlns:custom="clr-namespace:LoadingSpinnerControl;assembly=LoadingSpinnerControl"
mc:Ignorable="d"
d:DesignHeight="680" d:DesignWidth="1080"
Background="Transparent">
@@ -18,20 +19,7 @@
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<!--<Border BorderThickness="4"
BorderBrush="#0000a0"
CornerRadius="5"
Grid.RowSpan="2"
Grid.ColumnSpan="3">
<Border.Background>
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
<GradientStop Color="{StaticResource ColorPrimary4}" Offset="0.2"/>
<GradientStop Color="{StaticResource ColorPrimary5}" Offset="0.8"/>
</LinearGradientBrush>
</Border.Background>
</Border>-->
</Grid.ColumnDefinitions>
<StackPanel Grid.ColumnSpan="3">
<TextBlock
@@ -54,7 +42,7 @@
FontSize="20"
Foreground="{StaticResource BrushPrimary1}">
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Grid.Row="2"
VerticalAlignment="Stretch">
@@ -75,39 +63,75 @@
Cursor="Hand"
Command="{Binding AddTournamentCommand}"/>
</StackPanel>
<StackPanel Grid.Column="1"
<Grid Grid.Column="1"
Grid.Row="1"
Margin="20">
<TextBlock Margin="20"
Margin="20">
<StackPanel>
<TextBlock Margin="20"
Text="Liste der erstellten Turniere"
TextAlignment="Center"
FontFamily="Arial"
FontWeight="Bold"
FontSize="16"
Foreground="{StaticResource BrushPrimary1}"/>
<components:OverViewListing Height="400"
<components:OverViewListing Height="400"
Width="400"
DataContext="{Binding OverviewListingViewModel}"/>
</StackPanel>
<StackPanel Grid.Column="2"
</StackPanel>
<StackPanel VerticalAlignment="Center">
<StackPanel.Style>
<Style TargetType="StackPanel">
<Setter Property="Visibility" Value="Collapsed"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsLoading}" Value="true">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</StackPanel.Style>
<TextBlock Text="Daten werden geladen...."
TextAlignment="Center"
VerticalAlignment="Center"
Foreground="{StaticResource BrushPrimary1}"
Margin="0 0 0 30"
FontSize="14">
</TextBlock>
<custom:LoadingSpinner Diameter="50" IsLoading="True" Thickness="3" Color="{StaticResource BrushPrimary1}"/>
</StackPanel>
</Grid>
<Grid Grid.Column="2"
Grid.Row="1"
VerticalAlignment="Center">
<TextBlock Margin="20"
<Grid.Style>
<Style TargetType="Grid">
<Setter Property="Visibility" Value="Hidden"/>
<Style.Triggers>
<DataTrigger Binding="{Binding IsLoading}" Value="false">
<Setter Property="Visibility" Value="Visible"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Grid.Style>
<StackPanel>
<TextBlock Margin="20"
Text="Turnieredetails"
TextAlignment="Center"
FontFamily="Arial"
FontWeight="Bold"
FontSize="16"
Foreground="{StaticResource BrushPrimary1}"/>
<components:OverviewDetails Width="320"
<components:OverviewDetails Width="320"
DataContext="{Binding OverviewDetailsViewModel}"/>
<Button Style="{StaticResource ModernButton}"
<Button Style="{StaticResource ModernButton}"
Content="Namensliste"
FontSize="16"
Height="40"
@@ -115,7 +139,9 @@
Margin="40"
Cursor="Hand"
Command="{Binding NavigateNavBarCommand}"/>
</StackPanel>
</StackPanel>
</Grid>
</Grid>
</UserControl>

11
Apollon.WPF/Views/WarningDeleteView.xaml
View File

@@ -3,7 +3,8 @@
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:custom="clr-namespace:LoadingSpinnerControl;assembly=LoadingSpinnerControl"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
@@ -25,6 +26,7 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="35"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0"
@@ -36,13 +38,18 @@
FontSize="14"
/>
<Button Grid.Column="1"
<Button Grid.Column="2"
Content="Abbrechen"
Command="{Binding WarningCloseCommand}"
Style="{StaticResource ModernButton}"
Width="100"
Height="30"
FontSize="14"/>
<custom:LoadingSpinner Grid.Column="1"
Diameter="25"
Thickness="2"
Color="{StaticResource BrushPrimary1}"
IsLoading="{Binding IsDeleting}"/>
</Grid>
</StackPanel>
</Grid>