Skip to content
Snippets Groups Projects
Commit b3a923f6 authored by Sandra Borst's avatar Sandra Borst
Browse files

improved design of overview page, made seonds warning mode work, made it... 

improved design of overview page, made seonds warning mode work, made it possible to enter custom values
parent de85ead0
No related branches found
No related tags found
1 merge request!55improved design of overview page, made seonds warning mode work, made it...
Expand all Show whitespace changes
Inline Side-by-side
InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/Regulaer/01Overview.xaml
+ 127
− 56
View file @ b3a923f6
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:InnoLabProjektDektopApp" xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates" xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
mc:Ignorable="d"> mc:Ignorable="d"
Background="{StaticResource BACKGROUND_PRIMARY_BRUSH}">
<ScrollViewer> <ScrollViewer>
<Grid> <Grid VerticalAlignment="Center">
<StackPanel Margin="20,0,20,20"> <StackPanel Margin="20,0,20,20">
<!-- Überschrift --> <!-- Überschrift -->
...@@ -19,7 +20,7 @@ ...@@ -19,7 +20,7 @@
<!-- Profiles and Add Button Section --> <!-- Profiles and Add Button Section -->
<Border Background="#333333" CornerRadius="10" Padding="15" > <Border Background="{StaticResource BACKGROUND_SECONDARY_BRUSH}" CornerRadius="10" Padding="15" >
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock Style="{StaticResource Header2}" <TextBlock Style="{StaticResource Header2}"
Text="Want to customize this profile?" Text="Want to customize this profile?"
...@@ -62,7 +63,7 @@ HorizontalAlignment="Left" /> ...@@ -62,7 +63,7 @@ HorizontalAlignment="Left" />
</Border> </Border>
<!-- Settings Section --> <!-- Settings Section -->
<Border Background="#333333" CornerRadius="10" Padding="15" Margin="0,20,0,0"> <Border Background="{StaticResource BACKGROUND_SECONDARY_BRUSH}" CornerRadius="10" Padding="15" Margin="0,20,0,0">
<StackPanel> <StackPanel>
<!-- Überschrift innerhalb des Hintergrunds --> <!-- Überschrift innerhalb des Hintergrunds -->
<TextBlock Style="{StaticResource Header2}" <TextBlock Style="{StaticResource Header2}"
...@@ -75,71 +76,143 @@ HorizontalAlignment="Left" /> ...@@ -75,71 +76,143 @@ HorizontalAlignment="Left" />
<StackPanel Grid.Row="0" Grid.Column="0" Margin="10"> <StackPanel Grid.Row="0" Grid.Column="0" Margin="10">
<TextBlock Text="Focus period" FontSize="14" FontWeight="Bold" Foreground="White" /> <TextBlock Text="Focus period" FontSize="14" FontWeight="Bold" Foreground="White" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ComboBox x:Name="FocusPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="70" FontSize="14" Padding="5" SelectionChanged="ComboBox_SelectionChanged" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
<ComboBoxItem Content="1" /> <Border Name="DropdownBorder1" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" Margin="0,5,0,0"
<ComboBoxItem Content="20" /> Width="70" MouseDown="TogglePopup1">
<ComboBoxItem Content="30" /> <Grid>
<ComboBoxItem Content="40" /> <TextBox x:Name="SelectedText1" Text="45" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}"
<ComboBoxItem Content="50" IsSelected="True" /> FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"
<ComboBoxItem Content="60" /> Background="Transparent" BorderThickness="0" TextChanged="SelectedTextBox_TextChanged"/>
<ComboBoxItem Content="90" /> <Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
<ComboBoxItem Content="120" /> </Grid>
<ComboBoxItem Content="150" /> </Border>
<ComboBoxItem Content="180" />
</ComboBox> <!-- Popup für die Dropdown-Liste -->
<TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" /> <Popup Name="PopupMenu1" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder1}" StaysOpen="True" Width="70">
<Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="70">
<ListBox x:Name="CategoryList1" SelectionChanged="CategoryList_SelectionChanged1" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
<ListBoxItem Content="20"/>
<ListBoxItem Content="30"/>
<ListBoxItem Content="45"/>
<ListBoxItem Content="60"/>
<ListBoxItem Content="90"/>
<ListBoxItem Content="120"/>
<ListBoxItem Content="180"/>
</ListBox>
</Border>
</Popup>
<TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="0" Grid.Column="1" Margin="10"> <StackPanel Grid.Row="0" Grid.Column="1" Margin="10">
<TextBlock Text="Break period" FontSize="14" FontWeight="Bold" Foreground="White" /> <TextBlock Text="Break period" FontSize="14" FontWeight="Bold" Foreground="White" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<ComboBox x:Name="BreakPeriodComboBox" HorizontalAlignment="Left" Height="30" Width="70" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
<ComboBoxItem Content="0" /> <Border Name="DropdownBorder2" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" Margin="0,5,0,0"
<ComboBoxItem Content="1" /> Width="70" MouseDown="TogglePopup2">
<ComboBoxItem Content="3" /> <Grid>
<ComboBoxItem Content="5" /> <TextBox x:Name="SelectedText2" Text="10" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}"
<ComboBoxItem Content="10" IsSelected="True" /> FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"
<ComboBoxItem Content="15" /> Background="Transparent" BorderThickness="0" TextChanged="SelectedTextBox_TextChanged"/>
<ComboBoxItem Content="20" /> <Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
<ComboBoxItem Content="25" /> </Grid>
<ComboBoxItem Content="30" /> </Border>
</ComboBox>
<TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" Foreground="Gray" /> <!-- Popup für die Dropdown-Liste -->
<Popup Name="PopupMenu2" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder2}" StaysOpen="True" Width="70">
<Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="70">
<ListBox x:Name="CategoryList2" SelectionChanged="CategoryList_SelectionChanged2" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
<ListBoxItem Content="0"/>
<ListBoxItem Content="1"/>
<ListBoxItem Content="3"/>
<ListBoxItem Content="5"/>
<ListBoxItem Content="10"/>
<ListBoxItem Content="20"/>
<ListBoxItem Content="30"/>
</ListBox>
</Border>
</Popup>
<TextBlock Text="minutes" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="14" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="0" Grid.Column="2" Margin="10"> <StackPanel Grid.Row="0" Grid.Column="2" Margin="10">
<TextBlock Text="Cycles" FontSize="14" FontWeight="Bold" Foreground="White" /> <TextBlock Text="Cycles" FontSize="14" FontWeight="Bold" Foreground="White" />
<ComboBox x:Name="CyclesComboBox" HorizontalAlignment="Left" Height="30" Width="50" FontSize="14" Padding="5" IsEditable="True" PreviewTextInput="ComboBox_PreviewTextInput">
<ComboBoxItem Content="1" /> <Border Name="DropdownBorder3" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" Margin="0,5,0,0"
<ComboBoxItem Content="2" /> Width="70" MouseDown="TogglePopup3">
<ComboBoxItem Content="3" /> <Grid>
<ComboBoxItem Content="4" IsSelected="True" /> <TextBox x:Name="SelectedText3" Text="10" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}"
<ComboBoxItem Content="5" /> FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"
<ComboBoxItem Content="6" /> Background="Transparent" BorderThickness="0" TextChanged="SelectedTextBox_TextChanged"/>
</ComboBox> <Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
</Grid>
</Border>
<!-- Popup für die Dropdown-Liste -->
<Popup Name="PopupMenu3" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder3}" StaysOpen="True" Width="70">
<Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="70">
<ListBox x:Name="CategoryList3" SelectionChanged="CategoryList_SelectionChanged3" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
<ListBoxItem Content="1"/>
<ListBoxItem Content="2"/>
<ListBoxItem Content="3"/>
<ListBoxItem Content="4"/>
<ListBoxItem Content="5"/>
<ListBoxItem Content="6"/>
</ListBox>
</Border>
</Popup>
</StackPanel> </StackPanel>
<!-- Zweite Reihe --> <!-- Zweite Reihe -->
<StackPanel Grid.Row="1" Grid.Column="0" Margin="10" x:Name="SecondsWarningPanel" > <StackPanel Grid.Row="1" Grid.Column="0" Margin="10" x:Name="SecondsWarningPanel" Visibility="Collapsed" >
<TextBlock Text="Seconds" Foreground="White" FontSize="14" FontWeight="Bold" /> <TextBlock Text="Seconds" Foreground="White" FontSize="14" FontWeight="Bold" />
<ComboBox x:Name="SecondsWarningComboBox" Width="50" HorizontalAlignment="Left"> <Border Name="DropdownBorder4" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" Margin="0,5,0,0"
<ComboBoxItem Content="3" /> Width="70" MouseDown="TogglePopup4">
<ComboBoxItem Content="5" /> <Grid>
<ComboBoxItem Content="10" IsSelected="True"/> <TextBox x:Name="SelectedText4" Text="4" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}"
<ComboBoxItem Content="15" /> FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"
<ComboBoxItem Content="30" /> Background="Transparent" BorderThickness="0" TextChanged="SelectedTextBox_TextChanged"/>
</ComboBox> <Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
</Grid>
</Border>
<!-- Popup für die Dropdown-Liste -->
<Popup Name="PopupMenu4" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder4}" StaysOpen="True" Width="70">
<Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="70">
<ListBox x:Name="CategoryList4" SelectionChanged="CategoryList_SelectionChanged4" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
<ListBoxItem Content="3"/>
<ListBoxItem Content="5"/>
<ListBoxItem Content="10"/>
<ListBoxItem Content="15"/>
<ListBoxItem Content="30" />
</ListBox>
</Border>
</Popup>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="10"> <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="10">
<TextBlock Text="Distraction Mode" Foreground="White" FontSize="14" FontWeight="Bold" /> <TextBlock Text="Distraction Mode" Foreground="White" FontSize="14" FontWeight="Bold" />
<ComboBox x:Name="DistractionModeComboBox" Width="170" HorizontalAlignment="Left" SelectionChanged="DistractionMode_SelectionChanged">
<ComboBoxItem Content="Full-blocking mode" IsSelected="True" /> <Border Name="DropdownBorder" Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Margin="0,5,0,0"
<ComboBoxItem Content="seconds warning mode" /> Width="200" MouseDown="TogglePopup">
<ComboBoxItem Content="Mascot feedback only" /> <Grid>
</ComboBox> <TextBlock x:Name="SelectedText" Text="Full-blocking mode" Foreground="{StaticResource BACKGROUND_PRIMARY_BRUSH}" FontWeight="Bold" VerticalAlignment="Center" Margin="10,0,30,0"/>
<Path Fill="{StaticResource BACKGROUND_PRIMARY_BRUSH}" Data="M 0 0 L 8 8 L 16 0 Z" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="10"/>
</Grid>
</Border>
<!-- Popup für die Dropdown-Liste -->
<Popup Name="PopupMenu" Placement="Bottom" PlacementTarget="{Binding ElementName=DropdownBorder}" StaysOpen="True" Width="200">
<Border Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}" CornerRadius="5" BorderThickness="1" BorderBrush="Black" Width="200">
<ListBox x:Name="CategoryList" SelectionChanged="CategoryList_SelectionChanged" Background="{StaticResource HIGHLIGHT_SECONDARY_BRUSH}">
<ListBoxItem Content="Full-blocking mode"/>
<ListBoxItem Content="seconds warning mode"/>
<ListBoxItem Content="Mascot feedback only"/>
</ListBox>
</Border>
</Popup>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10" Width="150"> <StackPanel Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" Margin="10" Width="150">
...@@ -190,10 +263,8 @@ TextChanged="FocusTopicInputBox_TextChanged" /> ...@@ -190,10 +263,8 @@ TextChanged="FocusTopicInputBox_TextChanged" />
</Grid> </Grid>
<!-- Start Button --> <!-- Start Button -->
<Border Width="150" Height="50" CornerRadius="25" Background="Gray" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="0,10,0,0"> <Border Margin="0,10" Style="{StaticResource RoundedButtonBorder}" MouseDown="StartButton_Click">
<Button Background="Transparent" BorderThickness="0" Click="StartButton_Click"> <TextBlock Text="Start" Style="{StaticResource ButtonTextStyle}" />
<TextBlock Text="Start" FontSize="16" FontWeight="Bold" Foreground="#1A202C" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</Border> </Border>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment