Skip to content
Snippets Groups Projects
Commit 7d57d88b authored by Your Name's avatar Your Name
Browse files

updated burger menu style, added burger menu to overview

parent 20e43a3c
No related branches found
No related tags found
1 merge request!66updated burger menu style, added burger menu to overview
This commit is part of merge request !66. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
Showing
with 174 additions and 13 deletions
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
+ 48
− 4
Edit View file @ 7d57d88b
......@@ -10,13 +10,18 @@
Background="{StaticResource BACKGROUND_PRIMARY_BRUSH}">
<ScrollViewer>
<Grid VerticalAlignment="Center">
<StackPanel Margin="20,0,20,20">
<!-- Überschrift -->
<TextBlock Style="{StaticResource Header1}"
Text="Selection and editing of your saved profiles"
HorizontalAlignment="Left"
Margin="0,10,0,10" />
Margin="50,10,0,10" />
......@@ -289,6 +294,45 @@ TextChanged="FocusTopicInputBox_TextChanged" />
</StackPanel>
<ToggleButton x:Name="BurgerMenuButton"
Click="BurgerMenuButton_Click"
Margin="10,0,0,0"
VerticalAlignment="Top"
HorizontalAlignment="Left"
Style="{StaticResource BurgerMenuButtonStyle}">
<TextBlock Text="☰" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</ToggleButton>
<StackPanel x:Name="MenuPanel"
Visibility="Collapsed"
VerticalAlignment="Top"
HorizontalAlignment="Left"
Margin="10,80,0,0">
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_2">
<TextBlock Text="Distractions" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_3">
<TextBlock Text="ProgrammsList" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_4">
<TextBlock Text="Overview" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_6">
<TextBlock Text="Abonnement" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_7">
<TextBlock Text="Contract" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_8">
<TextBlock Text="Settings" Style="{StaticResource ButtonTextStyle}" />
</Border>
</StackPanel>
</Grid>
</ScrollViewer>
</Page>
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml.cs
+ 43
− 1
Edit View file @ 7d57d88b
using InnoLabProjektDektopApp.Services;
using InnoLabProjektDektopApp.Screens.Regulaer;
using InnoLabProjektDektopApp.Services;
using InnoLabProjektDektopApp.Services.WebSocketServer;
using System.IO;
using System.Net.Sockets;
......@@ -698,5 +699,46 @@ namespace InnoLabProjektDektopApp
}
}
private void Button_Click_2(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Distractions());
}
private void Button_Click_3(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new ProgramsList());
}
private void Button_Click_4(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Overview());
}
private void Button_Click_5(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Statistics());
}
private void Button_Click_6(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Abonnement());
}
private void Button_Click_7(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Contact());
}
private void Button_Click_8(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Settings());
}
private void BurgerMenuButton_Click(object sender, RoutedEventArgs e)
{
MenuPanel.Visibility = MenuPanel.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
}
}
}
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/02Session.xaml
+ 0
− 4
Edit View file @ 7d57d88b
......@@ -36,10 +36,6 @@
<TextBlock Text="Overview" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_5">
<TextBlock Text="Statistics" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_6">
<TextBlock Text="Abonnement" Style="{StaticResource ButtonTextStyle}" />
</Border>
......
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml
+ 39
− 0
Edit View file @ 7d57d88b
......@@ -11,6 +11,7 @@
Background="{StaticResource BACKGROUND_PRIMARY_BRUSH}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
......@@ -28,6 +29,44 @@
<Canvas Name="chartCanvas" Margin="150" Grid.Row="1" Grid.Column="0"
HorizontalAlignment="Left" VerticalAlignment="Top">
<ToggleButton x:Name="BurgerMenuButton"
Click="BurgerMenuButton_Click"
Margin="10,20,0,0"
VerticalAlignment="Top"
HorizontalAlignment="Left"
Style="{StaticResource BurgerMenuButtonStyle}">
<TextBlock Text="☰" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</ToggleButton>
<StackPanel x:Name="MenuPanel"
Visibility="Collapsed"
VerticalAlignment="Top"
HorizontalAlignment="Left"
Margin="10,80,0,0">
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_2">
<TextBlock Text="Distractions" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_3">
<TextBlock Text="ProgrammsList" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_4">
<TextBlock Text="Overview" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_6">
<TextBlock Text="Abonnement" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_7">
<TextBlock Text="Contract" Style="{StaticResource ButtonTextStyle}" />
</Border>
<Border Style="{StaticResource RoundedButtonBorder2}" MouseDown="Button_Click_8">
<TextBlock Text="Settings" Style="{StaticResource ButtonTextStyle}" />
</Border>
</StackPanel>
<Rectangle x:Name="chartBackground" Width="480" Height="150" Fill="#333436" RadiusX="10" RadiusY="10" Margin="-15,-25" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<TextBlock Text="Your session overview" FontSize="32" FontWeight="Bold"
HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,-25"/>
......
......
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/SessionStatistics.xaml.cs
+ 40
− 0
Edit View file @ 7d57d88b
......@@ -346,5 +346,45 @@ namespace InnoLabProjektDektopApp.Screens.Regulaer
public required bool IsBreak { get; set; }
public required int Cycle { get; set; }
}
private void Button_Click_2(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Distractions());
}
private void Button_Click_3(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new ProgramsList());
}
private void Button_Click_4(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Overview());
}
private void Button_Click_5(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Statistics());
}
private void Button_Click_6(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Abonnement());
}
private void Button_Click_7(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Contact());
}
private void Button_Click_8(object sender, RoutedEventArgs e)
{
this.NavigationService.Navigate(new Settings());
}
private void BurgerMenuButton_Click(object sender, RoutedEventArgs e)
{
MenuPanel.Visibility = MenuPanel.Visibility == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
}
}
}
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Styles/Styles.xaml
+ 4
− 4
Edit View file @ 7d57d88b
......@@ -306,11 +306,11 @@
<Setter Property="Margin" Value="10,20,0,0"/>
<Setter Property="VerticalAlignment" Value="Top"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="Background" Value="{StaticResource BACKGROUND_SECONDARY_BRUSH}"/>
<Setter Property="Background" Value="Transparent"/>
<!-- Green background -->
<Setter Property="Foreground" Value="{StaticResource TEXT_PRIMARY_BRUSH}"/>
<!-- White text -->
<Setter Property="FontSize" Value="40"/>
<Setter Property="FontSize" Value="50"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Cursor" Value="Hand"/>
......@@ -328,11 +328,11 @@
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{StaticResource BACKGROUND_SECONDARY_BRUSH}"/>
<Setter Property="Background" Value="Transparent"/>
<!-- Darker green on hover -->
</Trigger>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Background" Value="{StaticResource BACKGROUND_SECONDARY_BRUSH}"/>
<Setter Property="Background" Value="Transparent"/>
<!-- Even darker green when checked -->
</Trigger>
</Style.Triggers>
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment