Added settingsmenu

Breda-Tour/Breda-Tour.csproj

@@ -75,6 +75,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>

Breda-Tour/Data/HelpPageDatabase.cs

@@ -22,18 +22,13 @@ namespace Breda_Tour.Data
         }
         private void readHelpItems()
         {
-            Task.Run(() =>
+            string json = File.ReadAllText("Storage/helpitems/helpitems.json");
+            JObject JsonObject = JObject.Parse(json);
+            IList<JToken> JsonList = JsonObject["HelpItems"].ToList();
+            foreach (JToken helpitem in JsonList)
             {
-                string json = File.ReadAllText("Storage/helpitems/helpitems.json");
-                JObject JsonObject = JObject.Parse(json);
-                IList<JToken> JsonList = JsonObject["HelpItems"].ToList();
-                foreach (JToken helpitem in JsonList)
-                {
-                    HelpItems.Add(JsonConvert.DeserializeObject<HelpItem>(helpitem.ToString()));
-                }
-                System.Diagnostics.Debug.WriteLine(HelpItems[0].HelpItemSteps[0].Title);
-
-            });
+                HelpItems.Add(JsonConvert.DeserializeObject<HelpItem>(helpitem.ToString()));
+            }
         }
     }
 }

Breda-Tour/HelpScreen/HelpPage.xaml

@@ -14,10 +14,10 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="75"/>
         </Grid.RowDefinitions>
-        <c:DefaultTopBar MySymbol="{StaticResource SymbolClose}" Header="HelpItem" />
+        <c:DefaultTopBar MySymbol="{StaticResource SymbolClose}" Tapped="Close_Tapped" x:Name="Topbar"/>
         <ScrollViewer HorizontalScrollBarVisibility="Disabled" HorizontalScrollMode="Disabled" VerticalScrollMode="Enabled" VerticalScrollBarVisibility="Hidden" Background="White"  Grid.Row="1" Padding="20,20,20,0">
             <StackPanel Orientation="Vertical" Height="Auto">
-                <TextBlock Text="Afbeelding" FontWeight="Bold"/>
+                <TextBlock Text="{Binding Title}" FontWeight="Bold"/>
                 <Image
                 Name="HelpImage"
                 Height="400"
@@ -26,7 +26,8 @@
                 </Image>
                 <TextBlock Margin="0,10,0,0" Text="Description" FontWeight="Bold"/>
                 <TextBlock Margin="0,10,0,0"
-                       TextWrapping="Wrap">
+                       TextWrapping="Wrap"
+                       Text="{Binding Description}">
                 </TextBlock>
 
             </StackPanel>
@@ -38,9 +39,9 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <TextBlock Foreground="White" FontSize="18" Text="Back" Margin="20,0,0,0" VerticalAlignment="Center"/>
-            <TextBlock Foreground="White" FontSize="18" Text="Page 1 of 4" VerticalAlignment="Center" HorizontalAlignment="Center"  Grid.Column="1"/>
-            <TextBlock Foreground="White" FontSize="18" Text="Next" Margin="0,0,20,0" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Column="2"/>
+            <TextBlock Tapped="PageBack_Tapped" Foreground="White" FontSize="18" Text="Back" Margin="20,0,0,0" VerticalAlignment="Center"/>
+            <TextBlock Name="PageNumberTextBlock" Foreground="White" FontSize="18" Text="Page 1 of 4" VerticalAlignment="Center" HorizontalAlignment="Center"  Grid.Column="1"/>
+            <TextBlock Tapped="PageForward_Tapped" Foreground="White" FontSize="18" Text="Next" Margin="0,0,20,0" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Column="2"/>
         </Grid>
     </Grid>
 </Page>

Breda-Tour/HelpScreen/HelpPage.xaml.cs

@@ -1,4 +1,6 @@
-using System;
+using Breda_Tour.Data;
+using Breda_Tours.SettingsScreen;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -22,9 +24,43 @@ namespace Breda_Tour.HelpScreen
     /// </summary>
     public sealed partial class HelpPage : Page
     {
+        HelpItem helpitem;
+        int currentpage;
+
         public HelpPage()
         {
             this.InitializeComponent();
         }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            helpitem = ((HelpItem)e.Parameter);
+            SetPage(0);
+            Topbar.Header = helpitem.Title;
+        }
+
+        private void SetPage(int pagenumber)
+        {
+            if(pagenumber >= 0 && pagenumber < helpitem.HelpItemSteps.Count)
+            {
+                currentpage = pagenumber;
+                this.DataContext = helpitem.HelpItemSteps[currentpage];
+                PageNumberTextBlock.Text = "Page " + (currentpage+1) + " of " + helpitem.HelpItemSteps.Count;
+            }
+        }
+
+        private void Close_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            MainPage.RootFrame.Navigate(typeof(SettingsPage));
+        }
+
+        private void PageBack_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            SetPage(currentpage - 1);
+        }
+        private void PageForward_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            SetPage(currentpage + 1);
+        }
     }
 }

Breda-Tour/SettingsScreen/SettingsPage.xaml

@@ -27,29 +27,28 @@
                 </ListViewItem>
                 <Rectangle Margin="0,15,0,0" Fill="#99000000" Height="1" />
                 <TextBlock Style="{StaticResource SettingsHeaderStyle}" Foreground="{StaticResource BredaToursMainColorBrush}" Text="{StaticResource AppSettingsHelp}"></TextBlock>
-                <ListView ItemsSource="{x:Bind HelpItems}" >
-                    <ListView.ItemTemplate>
-                        <DataTemplate x:DataType="data:HelpItem">
+                <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"/>
+                                    <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"
-                                            >
+                                                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>
+                                </Grid>                                
                             </ListBoxItem>
                         </DataTemplate>
                     </ListView.ItemTemplate>

Breda-Tour/SettingsScreen/SettingsPage.xaml.cs

@@ -48,5 +48,10 @@ namespace Breda_Tours.SettingsScreen
             DataContext = this;
         }
 
+        private void ListView_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            HelpItem helpitem = (HelpItem)e.ClickedItem;
+            MainPage.RootFrame.Navigate(typeof(HelpPage), helpitem);
+        }
     }
 }

Breda-Tour/Storage/helpitems/helpitems.json

@@ -6,13 +6,13 @@
             "Steps" : 
             [
                 {
-                    "Title":"Druk op settings",
-                    "Description":"Jemoeder",
+                    "Title":"Ga naar het instellingen menu",
+                    "Description":"Druk hiervoor op het 3e icoontje bovenin het menu. ",
                     "ImageSource" :"1.jpg"
                 },
                 {
-                    "Title":"Druk op settings",
-                    "Description":"Jemoeder",
+                    "Title":"Druk op taal instellen",
+                    "Description":"",
                     "ImageSource" :"1.jpg"
                 }
             ]