Merge branch 'developer' of https://github.com/jancoow/Breda-Tour into developer

Breda-Tour/Breda-Tour.csproj

@@ -105,6 +105,17 @@
     <Content Include="Assets\Map_Icon.png" />
     <Content Include="Assets\UitklapIcon1.png" />
     <Content Include="Assets\UitklapIcon2.png" />
+    <Content Include="Storage\helpimages\screen_1.png" />
+    <Content Include="Storage\helpimages\screen_10.png" />
+    <Content Include="Storage\helpimages\screen_11.png" />
+    <Content Include="Storage\helpimages\screen_2.png" />
+    <Content Include="Storage\helpimages\screen_3.png" />
+    <Content Include="Storage\helpimages\screen_4.png" />
+    <Content Include="Storage\helpimages\screen_5.png" />
+    <Content Include="Storage\helpimages\screen_6.png" />
+    <Content Include="Storage\helpimages\screen_7.png" />
+    <Content Include="Storage\helpimages\screen_8.png" />
+    <Content Include="Storage\helpimages\screen_9.png" />
     <Content Include="Storage\Images\1.jpg" />
     <Content Include="Storage\Images\10.jpg" />
     <Content Include="Storage\Images\11.jpg" />

Breda-Tour/Data/Gps.cs

@@ -14,11 +14,11 @@ namespace Breda_Tour.Data
 {
     public class Gps
     {
-        private ExtendedExecutionSession session;
         private MapPage mapPage;
         private Geolocator geolocator;
 
         private Geoposition _position;
+
         public Geoposition Position
         {
             get { return _position; }
@@ -28,6 +28,7 @@ namespace Breda_Tour.Data
 
 
         private PositionStatus _status;
+
         public PositionStatus Status
         {
             get { return _status; }
@@ -52,7 +53,6 @@ namespace Breda_Tour.Data
                     geolocator.PositionChanged += OnPositionChanged;
                     // Get position
                     _position = await geolocator.GetGeopositionAsync();
-                    StartLocationExtensionSession();
                     break;
                 case GeolocationAccessStatus.Denied:
                     _status = PositionStatus.NotAvailable;
@@ -95,27 +95,5 @@ namespace Breda_Tour.Data
                 mapPage.ShowLocaton(_position.Coordinate.Point);
             }
         }
-
-        private async void StartLocationExtensionSession()
-        {
-            session = new ExtendedExecutionSession();
-            session.Description = "Location Tracker";
-            session.Reason = ExtendedExecutionReason.LocationTracking;
-            session.Revoked += ExtendedExecutionSession_Revoked;
-            var result = await session.RequestExtensionAsync();
-            if (result == ExtendedExecutionResult.Denied)
-            {
-                Debug.Write("Denied!!!!");
-            }
-        }
-
-        private void ExtendedExecutionSession_Revoked(object sender, ExtendedExecutionRevokedEventArgs args)
-        {
-            if (session != null)
-            {
-                session.Dispose();
-                session = null;
-            }
-        }
     }
 }

Breda-Tour/MapScreen/WpDetailPage.xaml

@@ -9,7 +9,7 @@
     xmlns:data="using:Breda_Tour.Data"
     mc:Ignorable="d">
 
-    <Grid Background="White">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -18,7 +18,7 @@
         </Grid.RowDefinitions>
 
         <c:DefaultTopBar x:Name="NameBar" Grid.Row="0" Header="{x:Bind wp.Title}"/>
-        <ListView Grid.Row="1" ItemsSource="{x:Bind wp.Pictures}"
+        <ListView Background="White" Grid.Row="1" ItemsSource="{x:Bind wp.Pictures}"
                   ScrollViewer.HorizontalScrollMode="Enabled"
                     ScrollViewer.IsHorizontalRailEnabled="True"
                     ScrollViewer.VerticalScrollMode="Disabled" HorizontalAlignment="Left" ScrollViewer.HorizontalScrollBarVisibility="Hidden">
@@ -40,11 +40,11 @@
             </ListView.ItemTemplate>
         </ListView>
 
-        <RelativePanel Grid.Row="2">
+        <RelativePanel Background="White" Grid.Row="2">
             <TextBlock x:Uid="WpDetailPagetxtBeschrijving" Text="Beschrijving" FontSize="20" Margin="15,15,0,15" />
             <Line X1="0" X2="{x:Bind Width, Mode=OneTime}" Y1="50" Y2="50" Stroke="Gray" StrokeThickness="2" />
         </RelativePanel>
-        <RelativePanel Grid.Row="3">
+        <RelativePanel Background="White" Grid.Row="3">
             <ScrollViewer Margin="15,0,0,0" VerticalScrollBarVisibility="Auto" >
                 <TextBlock HorizontalAlignment="Stretch"  VerticalAlignment="Stretch" TextWrapping="Wrap" Text="{x:Bind wp.Description}"/>
             </ScrollViewer>

Breda-Tour/RouteSelectScreen/RouteExample.xaml

@@ -9,7 +9,7 @@
     xmlns:data="using:Breda_Tour.Data"
     mc:Ignorable="d">
 
-    <Grid Background="White">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
@@ -19,7 +19,7 @@
 
         <c:DefaultTopBar Grid.Row="0" x:Uid="RouteExamplePagetxtRouteVoorbeeld" Header="Routevoorbeeld"/>
 
-        <StackPanel Grid.Row="1">
+        <StackPanel Background="White" Grid.Row="1">
             <StackPanel Orientation="Horizontal" Margin="10,10,0,0">
                 <TextBlock x:Uid="RouteExamplePagetxtRouteInformatie" Text="Route informatie" FontSize="16"/>
                 <Button x:Name="StartButton" Visibility="Collapsed" Click="Button_Click" Margin="120,0,0,0" >
@@ -32,14 +32,14 @@
             <TextBlock x:Name="WaypointsBlok" FontSize="16" Margin="10,0,0,10"/>
 
         </StackPanel>
-        <StackPanel Grid.Row="2">
+        <StackPanel Background="White" Grid.Row="2">
             <Image Source="ms-appx:///Assets/Map.png" Width="360"  />
         </StackPanel>
 
-        <ListView Grid.Row="3" Margin="10,0,0,0" x:Name="Waypoints" ItemsSource="{x:Bind route.Waypoints}" IsItemClickEnabled="True" ItemClick="Waypoints_OnItemClick">
+        <ListView Background="White" Grid.Row="3" x:Name="Waypoints" ItemsSource="{x:Bind route.Waypoints}" IsItemClickEnabled="True" ItemClick="Waypoints_OnItemClick">
             <ListView.ItemContainerStyle>
                 <Style TargetType="ListViewItem">
-                    <Setter Property="Padding" Value="0"/>
+                    <Setter Property="Padding" Value="10,0,0,0"/>
                     <Setter Property="Margin" Value="0"/>
                 </Style>
             </ListView.ItemContainerStyle>

Breda-Tour/Storage/helpitems/helpitems.json

@@ -1,46 +1,125 @@
 {
   "HelpItems": [
+    {
+      "Language": "nl-NL",
+      "Title": "Taal aanpassen",
+      "Steps": [
         {
+          "Title": "Ga naar het instellingen menu",
+          "Description": "Druk hiervoor op het 3e icoontje bovenin het menu. ",
+          "ImageSource": "screen_2.png"
+        },
+        {
+          "Title": "Druk op taal instellen / set language",
+          "Description": "Eerste optie in het menu. De taal zal wisselen van Nederlands naar Engels of andersom.",
+          "ImageSource": "screen_4.png"
+        }
+      ]
+    },
+    {
+      "Language": "nl-NL",
+      "Title": "Punt bekijken",
+      "Steps": [
+        {
+          "Title": "Start een route",
+          "Description": "Start de gewenste route op. Een beschrijving hiervan vindt u in het helpmenu.",
+          "ImageSource": "screen_7.png"
+        },
+        {
+          "Title": "Druk op een locatie.",
+          "Description": "Als u op een locatie drukt zal u de beschikbare beschrijving zien van dit punt.",
+          "ImageSource": "screen_8.png"
+        }
+      ]
+    },
+    {
             "Language" : "nl-NL",
-            "Title" : "Taal selecteren",
+            "Title" : "Route Selecteren",
             "Steps" : [
                 {
-                    "Title":"Ga naar het instellingen menu",
-                    "Description":"Druk hiervoor op het 3e icoontje bovenin het menu. ",
-                    "ImageSource" :"taal_1.jpg"
+                    "Title":"Ga naar het route selectie menu",
+                    "Description":"Druk hiervoor op het 1e icoontje bovenin het menu. ",
+                    "ImageSource" :"screen_2.png"
                 },
                 {
-                    "Title":"Druk op taal instellen / set language",
-                    "Description":"Eerste optie in het menu.",
-                    "ImageSource" :"taal_2.jpg"
+                    "Title":"Druk op de gewenste route",
+                    "Description":"Selecteer een route om naar het routevoorbeeld te gaan.",
+                    "ImageSource" :"screen_6.png"
                 },
                 {
-                    "Title":"Selecteer de gewenste taal",
-                    "Description":"Hier kunt u kiezen uit de beschikbare talen van deze applicatie.",
-                    "ImageSource" :"taal_3.jpg"
+                    "Title":"Route starten",
+                    "Description":"Druk op start om aan de gewenste route te beginnen.",
+                    "ImageSource" :"screen_7.png"
+                },
+                {
+                    "Title":"Route starten",
+                    "Description":"De route zal nu starten.",
+                    "ImageSource" :"screen_10.png"
                 }
             ] 
         },
-        {
-			      "Language" : "en-US",
-            "Title" : "Select Language",
+    {
+            "Language" : "en-US",
+            "Title" : "Select tour",
             "Steps" : [
                 {
-                    "Title":"Go to the settings menu",
-                    "Description":"To do that, press on the third icon in the top menu.",
-                    "ImageSource" :"taal_1.jpg"
+                    "Title":"Navigate to the tour selection menu",
+                    "Description":"Push the first button in the menu bar. ",
+                    "ImageSource" :"screen_2.png"
+                },
+                {
+                    "Title":"Select the route you want",
+                    "Description":"Select a tour to navigate to the preview screen.",
+                    "ImageSource" :"screen_6.png"
                 },
                 {
-                    "Title":"Press on taal instellen / set language",
-                    "Description":"First option in the menu",
-                    "ImageSource" :"taal_2.jpg"
+                    "Title":"Start route",
+                    "Description":"Push start to begin with the tour.",
+                    "ImageSource" :"screen_7.png"
                 },
                 {
-                    "Title":"Select the preferred language",
-                    "Description":"Here you can choose between the available languages of the application.",
-                    "ImageSource" :"taal_3.jpg"
+                    "Title":"Start route",
+                    "Description":"The tour will now start.",
+                    "ImageSource" :"screen_10.png"
                 }
-            ]
-		}
+            ] 
+        },
+    {
+      "Language": "en-US",
+      "Title": "Select Language",
+      "Steps": [
+        {
+          "Title": "Go to the settings menu",
+          "Description": "To do that, press on the third icon in the top menu.",
+          "ImageSource": "screen_2.png"
+        },
+        {
+          "Title": "Press on taal instellen / set language",
+          "Description": "First option in the menu. The language will switch to English or Dutch.",
+          "ImageSource": "screen_4.png"
+        },
+        {
+          "Title": "Select the preferred language",
+          "Description": "Here you can choose between the available languages of the application.",
+          "ImageSource": "taal_3.jpg"
+        }
+      ]
+    },
+    {
+      "Language": "en-US",
+      "Title": "View waypoint",
+      "Steps": [
+        {
+          "Title": "Start a tour",
+          "Description": "Start a tour. You can find a detailed description in the help menu.",
+          "ImageSource": "screen_7.png"
+        },
+        {
+          "Title": "Select a waypoint.",
+          "Description": "Select a waypoint on the screen. If you select the waypoint you will see the available description of the location.",
+          "ImageSource": "screen_8.png"
+        }
+      ]
+    }
     ]
 }