Moved helppage

Breda-Tour/HelpScreen/HelpPage.xaml.cs

@@ -47,7 +47,7 @@ namespace Breda_Tour.HelpScreen
 
         private void Close_Tapped(object sender, TappedRoutedEventArgs e)
         {
-            MainPage.RootFrame.Navigate(typeof(SettingsPage));
+            MainPage.RootFrame.Navigate(typeof(HelpScreenPage));
         }
 
         private void PageBack_Tapped(object sender, TappedRoutedEventArgs e)

Breda-Tour/HelpScreen/HelpScreenPage.xaml

@@ -6,6 +6,7 @@
     xmlns:c="using:Breda_Tour.CustomControls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:data="using:Breda_Tour.Data"
     mc:Ignorable="d">
 
     <Grid>
@@ -17,7 +18,37 @@
         <c:DefaultTopBar Header="Help" x:Uid="HelpScreenPagetxtHelpScreen"/>
         <c:DefaultPivotControl x:Name="DefaultPivot" Grid.Row="1"/>
         <StackPanel Grid.Row="2" Background="White">
-            
+            <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Hidden">
+                <StackPanel Orientation="Vertical" Background="White">
+                   <TextBlock x:Uid="AppSettingsHelp" Style="{StaticResource SettingsHeaderStyle}" Foreground="{StaticResource BredaToursMainColorBrush}" Text="{StaticResource AppSettingsHelp}"></TextBlock>
+                    <ListView ItemsSource="{x:Bind HelpItems}" IsItemClickEnabled="True" ItemClick="ListView_ItemClick" >
+                        <ListView.ItemTemplate >
+                            <DataTemplate  x:DataType="data:HelpItem">
+                                <ListBoxItem Padding="0" Background="Transparent" IsEnabled="False">
+                                    <Grid Height="50">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="50"/>
+                                            <ColumnDefinition Width="*"/>
+                                        </Grid.ColumnDefinitions>
+                                        <Ellipse Height="40" Width="40" Stroke="{StaticResource BredaToursMainColorBrush}" StrokeThickness="0.5"
+                                             Margin="5"
+                                             Name="FolderEllipse"/>
+                                        <SymbolIcon Symbol="Folder"
+                                                Foreground="{StaticResource BredaToursMainColorBrush}"
+                                                Margin="10"
+                                                >
+                                            <SymbolIcon.RenderTransform>
+                                                <RotateTransform Angle="270" CenterX="15" CenterY="15"/>
+                                            </SymbolIcon.RenderTransform>
+                                        </SymbolIcon>
+                                        <TextBlock RelativePanel.RightOf="FolderEllipse" Margin="10,14" Text="{x:Bind Title}" Grid.Column="1"/>
+                                    </Grid>
+                                </ListBoxItem>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </StackPanel>
+            </ScrollViewer>
         </StackPanel>
     </Grid>
 </Page>

Breda-Tour/HelpScreen/HelpScreenPage.xaml.cs

@@ -1,5 +1,7 @@
-using System;
+using Breda_Tour.Data;
+using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -22,11 +24,29 @@ namespace Breda_Tour.HelpScreen
     /// </summary>
     public sealed partial class HelpScreenPage : Page
     {
+        public ObservableCollection<HelpItem> HelpItems
+        {
+            get { return (ObservableCollection<HelpItem>)GetValue(HelpItemProperty); }
+            set { SetValue(HelpItemProperty, value); }
+        }
+        public static readonly DependencyProperty HelpItemProperty =
+        DependencyProperty.Register("HelpItems", typeof(ObservableCollection<HelpItem>), typeof(HelpScreenPage), null);
+
+
         public HelpScreenPage()
         {
             this.InitializeComponent();
             DefaultPivot.SetCheckedButton(Breda_Tour.CustomControls.DefaultPivotControl.Tab.Help);
+            HelpPageDatabase helpDatabase = new HelpPageDatabase();
+            HelpItems = helpDatabase.GetCurrentHelpItems();
 
+            DataContext = this;
+        }
+
+        private void ListView_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            HelpItem helpitem = (HelpItem)e.ClickedItem;
+            MainPage.RootFrame.Navigate(typeof(HelpPage), helpitem);
         }
     }
 }

Breda-Tour/SettingsScreen/SettingsPage.xaml

@@ -25,34 +25,6 @@
                         <TextBlock x:Uid="AppSettingstxtLanguageString" Margin="0,-1,0,0" FontSize="12"  Text="Nederlands"></TextBlock>
                     </StackPanel>
                 </ListViewItem>
-                <Rectangle Margin="0,15,0,0" Fill="#99000000" Height="1" />
-                <TextBlock x:Uid="AppSettingsHelp" Style="{StaticResource SettingsHeaderStyle}" Foreground="{StaticResource BredaToursMainColorBrush}" Text="{StaticResource AppSettingsHelp}"></TextBlock>
-                <ListView ItemsSource="{x:Bind HelpItems}" IsItemClickEnabled="True" ItemClick="ListView_ItemClick" >
-                    <ListView.ItemTemplate >
-                        <DataTemplate  x:DataType="data:HelpItem">
-                            <ListBoxItem Padding="0" Background="Transparent" IsEnabled="False">
-                                    <Grid Height="50">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="50"/>
-                                            <ColumnDefinition Width="*"/>
-                                        </Grid.ColumnDefinitions>
-                                        <Ellipse Height="40" Width="40" Stroke="{StaticResource BredaToursMainColorBrush}" StrokeThickness="0.5"
-                                             Margin="5"
-                                             Name="FolderEllipse"/>
-                                    <SymbolIcon Symbol="Folder"
-                                                Foreground="{StaticResource BredaToursMainColorBrush}"
-                                                Margin="10"
-                                                >
-                                        <SymbolIcon.RenderTransform>
-                                            <RotateTransform Angle="270" CenterX="15" CenterY="15"/>
-                                        </SymbolIcon.RenderTransform>
-                                    </SymbolIcon>
-                                    <TextBlock RelativePanel.RightOf="FolderEllipse" Margin="10,14" Text="{x:Bind Title}" Grid.Column="1"/>
-                                </Grid>                                
-                            </ListBoxItem>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
             </StackPanel>
         </ScrollViewer>
     </Grid>

Breda-Tour/SettingsScreen/SettingsPage.xaml.cs

@@ -29,31 +29,13 @@ namespace Breda_Tours.SettingsScreen
     /// </summary>
     public sealed partial class SettingsPage : Page
     {
-        public ObservableCollection<HelpItem> HelpItems
-        {
-            get { return (ObservableCollection<HelpItem>)GetValue(HelpItemProperty); }
-            set { SetValue(HelpItemProperty, value); }
-        }
-
-        public static readonly DependencyProperty HelpItemProperty =
-        DependencyProperty.Register("HelpItems", typeof(ObservableCollection<HelpItem>), typeof(SettingsPage), null);
-
-        public SettingsPage()
+     public SettingsPage()
         {
             this.InitializeComponent();
-
             DefaultPivot.SetCheckedButton(Breda_Tour.CustomControls.DefaultPivotControl.Tab.Settings);
-            HelpPageDatabase helpDatabase = new HelpPageDatabase();
-            HelpItems = helpDatabase.GetCurrentHelpItems();
-            
-            DataContext = this;
         }
 
-        private void ListView_ItemClick(object sender, ItemClickEventArgs e)
-        {
-            HelpItem helpitem = (HelpItem)e.ClickedItem;
-            MainPage.RootFrame.Navigate(typeof(HelpPage), helpitem);
-		}
+
 		
         private void listViewItemSetupLanguage_Tapped(object sender, TappedRoutedEventArgs e)
         {

Breda-Tour/project.lock.json

@@ -11523,7 +11523,7 @@
       ]
     },
     "Microsoft.ApplicationInsights.WindowsApps/1.0.0": {
-      "sha512": "fNCAjIwvbTV+G0dT14bgM5tptsqeSaKQaCrlq7QknOq1Xdm8ZmgsDYddMgXkvykyKLjWyU6fKuOpj6fsQJy+wQ==",
+      "sha512": "NvBQnFeiFd0O1QdBz06UGApD7zn7ztVi7qO18IsM3EjiXRNgfrEBXB+azNm8XqLY8xGFAqh3HAuSd/wHZMe0XA==",
       "type": "Package",
       "files": [
         "[Content_Types].xml",