Merge branch 'PagiProgres' into 'develop'

Paginator und screen für Progress in develop

See merge request !33

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/01Startscreen.xaml.cs

@@ -35,7 +35,7 @@ namespace InnoLabProjektDektopApp
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            //
+            this.NavigationService.Navigate(new Progress());
         }
     }
 }
\ No newline at end of file

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml

@@ -8,16 +8,60 @@
         mc:Ignorable="d">
     <Grid>
 
-        <Label Content="Your way to working more focused" HorizontalAlignment="Center" Margin="0,119,0,0" VerticalAlignment="Top" Height="108" Width="780" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
-        <TextBlock HorizontalAlignment="Center" Height="39" TextWrapping="Wrap" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et" VerticalAlignment="Top" Width="324" Margin="0,216,0,0"/>
-        <Label Content="Edit distracting items" HorizontalAlignment="Left" Height="30" Margin="68,393,0,0" VerticalAlignment="Top" Width="125"/>
-        <Label Content="Edit Settings" HorizontalAlignment="Left" Height="25" Margin="386,398,0,0" VerticalAlignment="Top" Width="92"/>
-        <Label Content="Start focus session" HorizontalAlignment="Left" Height="26" Margin="695,397,0,0" VerticalAlignment="Top" Width="130"/>
-        <TextBlock HorizontalAlignment="Left" Height="68" Margin="68,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="126"/>
-        <TextBlock HorizontalAlignment="Center" Height="68" Margin="0,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="124"/>
-        <TextBlock HorizontalAlignment="Left" Height="68" Margin="695,428,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="125"/>
-        <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="68,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click1"/>
-        <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="388,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click2"/>
-        <Button Content="Button" HorizontalAlignment="Left" Height="40" Margin="695,343,0,0" VerticalAlignment="Top" Width="110" Click="Button_Click2"/>
+        <Label Content="Your way to working more focused" HorizontalAlignment="Center" Margin="0,91,0,0" VerticalAlignment="Top" Height="108" Width="780" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
+
+        <Canvas HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,240,0,0">
+            <Path StrokeThickness="3" Canvas.Left="-261" Canvas.Top="45.833" HorizontalAlignment="Center" Stretch="Fill" VerticalAlignment="Top" Width="191" Height="30" Stroke="Black">
+                <Path.Data>
+                    <PathGeometry>
+                        <PathFigure StartPoint="20,100">
+                            <BezierSegment Point1="100,100" Point2="200,0" Point3="300,50" />
+                        </PathFigure>
+                    </PathGeometry>
+                </Path.Data>
+            </Path>
+            <Path StrokeThickness="3" Canvas.Left="50.5" Canvas.Top="45.833" Stretch="Fill" Width="191" Height="30" Stroke="Black" HorizontalAlignment="Center" VerticalAlignment="Top">
+                <Path.Data>
+                    <PathGeometry Figures="M20,100 C100,100 200,0 300,50"/>
+                </Path.Data>
+            </Path>
+        </Canvas>
+
+        <TextBlock HorizontalAlignment="Center" Height="39" TextWrapping="Wrap" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et" VerticalAlignment="Top" Width="324" Margin="0,188,0,0"/>
+        <Label Content="Edit distracting items" HorizontalAlignment="Left" Height="30" Margin="68,331,0,0" VerticalAlignment="Top" Width="125"/>
+        <Label Content="Edit Settings" HorizontalAlignment="Left" Height="25" Margin="386,336,0,0" VerticalAlignment="Top" Width="92"/>
+        <Label Content="Start focus session" HorizontalAlignment="Left" Height="26" Margin="695,335,0,0" VerticalAlignment="Top" Width="130"/>
+        <TextBlock HorizontalAlignment="Left" Height="68" Margin="68,366,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="126"/>
+        <TextBlock HorizontalAlignment="Center" Height="68" Margin="0,366,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="124"/>
+        <TextBlock HorizontalAlignment="Left" Height="68" Margin="695,366,0,0" TextWrapping="Wrap" Text="Aliquam erat volutpat. Integer malesuada turpis id fringilla suscipit. Maecenas ultrices, orci vitae convallis mattis." VerticalAlignment="Top" Width="125"/>
+
+        <!-- Pagination -->
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,478,0,0" Width="265" VerticalAlignment="Top">
+            <Button Content="Previous" Width="70" Margin="5" Click="PreviousPage_Click" />
+            <StackPanel Orientation="Horizontal">
+                <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+                <!-- Aktive Seite -->
+                <Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
+                <!-- Inaktive Seite -->
+                <Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
+                <Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
+            </StackPanel>
+
+            <!--
+            <Button Content="1" Width="20" Margin="5" Click="first_Page" />
+            <Button Content="2" Width="20" Margin="5" Click="Second_Page" />
+            <Button Content="3" Width="20" Margin="5" Click="third_Page" />
+            <Button Content="4" Width="20" Margin="5" Click="fourth_Page" />
+            <Button Content="5" Width="20" Margin="5" Click="fifth_Page" />
+            -->
+
+            <Button Content="Next" Width="70" Margin="5" Click="NextPage_Click" />
+        </StackPanel>
+        <Image HorizontalAlignment="Left" Height="57" Margin="81,269,0,0" VerticalAlignment="Top" Width="54" Source="/Screens/FirstLaunch/filter.png"/>
+        <Image HorizontalAlignment="Center" Height="57" Margin="0,269,0,0" VerticalAlignment="Top" Width="54" Source="/Screens/FirstLaunch/settings.png"/>
+        <Image HorizontalAlignment="Left" Height="57" Margin="731,269,0,0" VerticalAlignment="Top" Width="54" Source="/Screens/FirstLaunch/play.png"/>
+
+
     </Grid>
+
 </Page>

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/02Progress.xaml.cs

@@ -32,5 +32,15 @@ namespace InnoLabProjektDektopApp
         {
             //this.Content = new AnotherWindow().Content;
         }
+
+        private void PreviousPage_Click(object sender, RoutedEventArgs e)
+        {
+            this.NavigationService.Navigate(new Startscreen());
+        }
+
+        private void NextPage_Click(object sender, RoutedEventArgs e)
+        {
+            this.NavigationService.Navigate(new Distractions());
+        }
     }
 }
\ No newline at end of file

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml

@@ -268,6 +268,30 @@
             </Border>
 
         </StackPanel>
+
+        <!-- Pagination -->
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,478,0,0" Width="265" VerticalAlignment="Top">
+            <Button Content="Previous" Width="70" Margin="5" Click="PreviousPage_Click" />
+            <StackPanel Orientation="Horizontal">
+                <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+                <!-- Aktive Seite -->
+                <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+                <!-- Inaktive Seite -->
+                <Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
+                <Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
+            </StackPanel>
+
+            <!--
+            <Button Content="1" Width="20" Margin="5" Click="first_Page" />
+            <Button Content="2" Width="20" Margin="5" Click="Second_Page" />
+            <Button Content="3" Width="20" Margin="5" Click="third_Page" />
+            <Button Content="4" Width="20" Margin="5" Click="fourth_Page" />
+            <Button Content="5" Width="20" Margin="5" Click="fifth_Page" />
+            -->
+
+            <Button Content="Next" Width="70" Margin="5" Click="NextPage_Click" />
+        </StackPanel>
+
     </Grid>
 
 </Page>

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/03_0Distractions.xaml.cs

@@ -257,6 +257,14 @@ namespace InnoLabProjektDektopApp
             }
         }
 
+        private void PreviousPage_Click(object sender, RoutedEventArgs e)
+        {
+            this.NavigationService.Navigate(new Progress());
+        }
 
+        private void NextPage_Click(object sender, RoutedEventArgs e)
+        {
+            this.NavigationService.Navigate(new Settings());
+        }
     }
 }

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml

@@ -180,6 +180,30 @@ ToolTip="You can decide how long the focus and break period should be. The focus
             </StackPanel>
 
 
+            <!-- Pagination -->
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,478,0,0" Width="265" VerticalAlignment="Top">
+                <Button Content="Previous" Width="70" Margin="5" Click="PreviousPage_Click" />
+                <StackPanel Orientation="Horizontal">
+                    <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+                    <!-- Aktive Seite -->
+                    <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+                    <!-- Inaktive Seite -->
+                    <Ellipse Width="15" Height="15" Fill="Black" Margin="5"/>
+                    <Ellipse Width="15" Height="15" Fill="Gray" Margin="5"/>
+                </StackPanel>
+
+                <!--
+            <Button Content="1" Width="20" Margin="5" Click="first_Page" />
+            <Button Content="2" Width="20" Margin="5" Click="Second_Page" />
+            <Button Content="3" Width="20" Margin="5" Click="third_Page" />
+            <Button Content="4" Width="20" Margin="5" Click="fourth_Page" />
+            <Button Content="5" Width="20" Margin="5" Click="fifth_Page" />
+            -->
+
+                <Button Content="Next" Width="70" Margin="5" Click="NextPage_Click" />
+            </StackPanel>
+
+
         </Grid>
 
     </ScrollViewer>

InnoLabProjektDektopApp/InnoLabProjektDektopApp/Screens/FirstLaunch/04Settings.xaml.cs

@@ -143,7 +143,15 @@ private void SaveSettingsButton_Click(object sender, RoutedEventArgs e)
 
 
 
+        private void PreviousPage_Click(object sender, RoutedEventArgs e)
+        {
+            this.NavigationService.Navigate(new Distractions());
+        }
 
+        private void NextPage_Click(object sender, RoutedEventArgs e)
+        {
+            this.NavigationService.Navigate(new Overview());
+        }
 
 
     }