Ver Fonte

Merge remote-tracking branch 'origin/developer' into RouteSelect

# Conflicts:
#	Breda-Tour/Breda-Tour.csproj
#	Breda-Tour/Storage/routes/routes.json
jancoow há 10 anos atrás
pai
commit
f7f60550f1

+ 6 - 0
Breda-Tour/App.xaml

@@ -29,6 +29,7 @@
             <x:String x:Key="SymbolClose"></x:String>
             <x:String x:Key="SymbolFolder"></x:String>
             <x:String x:Key="SymbolSettings"></x:String>
+            <x:String x:Key="SymbolHelp"></x:String>
             <x:String x:Key="SymbolGlobe"></x:String>
             <x:String x:Key="SymbolRouteSelect"></x:String>
             <x:String x:Key="SymbolStartRoute"></x:String>
@@ -44,7 +45,12 @@
                 <GradientStop Color="#185a9d" Offset="0"/>
                 <GradientStop Color="#43cea2" Offset="1"/>
             </LinearGradientBrush>
+            <LinearGradientBrush x:Key="BredaTourDropShadowBrush" StartPoint="0,0" EndPoint="0,1" SpreadMethod="Reflect">
+                <GradientStop Color="#44000000" Offset="0"/>
+                <GradientStop Color="#FFFFFFFF" Offset="0.5"/>
+                <GradientStop Color="#44000000" Offset="1"/>
 
+            </LinearGradientBrush>
             <Style TargetType="TextBlock" x:Key="SettingsHeaderStyle">
                 <Setter Property="Margin" Value="20,15,0,15"/>
                 <Setter Property="FontSize" Value="14"/>

+ 31 - 0
Breda-Tour/App.xaml.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -7,6 +9,7 @@ using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Windows.Globalization;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -22,6 +25,34 @@ namespace Breda_Tour
     /// </summary>
     sealed partial class App : Application
     {
+        #region Languages
+        private static string _language;
+        /// <summary>
+        /// Current languagues: [0] = nl-NL, [1] = en-US
+        /// </summary>
+        public static string[] Languages { get; } = { "nl-NL", "en-US" };
+        /// <summary>
+        /// Global current language property
+        /// </summary>
+        public static string Language {
+            get {
+                return _language;
+            }
+            set {
+                _language = value;
+                if (value == Languages[0])
+                {
+                    ApplicationLanguages.PrimaryLanguageOverride = "nl-NL";
+                    Debug.WriteLine("mijn taal is:" + ApplicationLanguages.ManifestLanguages.First());
+                }
+                else if (value == Languages[1])
+                {
+                    ApplicationLanguages.PrimaryLanguageOverride = "en-US";
+                    Debug.WriteLine("my language is:" + ApplicationLanguages.ManifestLanguages.First());
+                }
+            }
+        }
+        #endregion
         /// <summary>
         /// Initializes the singleton application object.  This is the first line of authored code
         /// executed, and as such is the logical equivalent of main() or WinMain().

+ 35 - 2
Breda-Tour/Breda-Tour.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Breda_Tour</RootNamespace>
     <AssemblyName>Breda-Tour</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <DefaultLanguage>nl-NL</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
@@ -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>
@@ -88,11 +89,16 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <PropertyGroup Label="MultilingualAppToolkit">
+    <MultilingualAppToolkitVersion>4.0</MultilingualAppToolkitVersion>
+    <MultilingualFallbackLanguage>nl-NL</MultilingualFallbackLanguage>
+  </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <Content Include="ApplicationInsights.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <PRIResource Include="en-US\Resources.resw" />
     <None Include="project.json" />
     <Content Include="Assets\Flag_Icon.png" />
     <Content Include="Assets\Map.png" />
@@ -125,15 +131,28 @@
     <Content Include="Storage\Images\7.jpg" />
     <Content Include="Storage\Images\8.jpg" />
     <Content Include="Storage\Images\9.jpg" />
+    <Content Include="Storage\helpimages\taal_1.jpg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Storage\helpimages\taal_2.jpg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Storage\Routes\routes.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Storage\helpitems\helpitems.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <PRIResource Include="nl-NL\Resources.resw" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="Data\Picture.cs" />
+    <Compile Include="Data\HelpItem.cs" />
+    <Compile Include="Data\HelpItemStep.cs" />
+    <Compile Include="Data\HelpPageDatabase.cs" />
     <Compile Include="Data\Route.cs" />
     <Compile Include="Data\RouteDatabase.cs" />
     <Compile Include="Data\Waypoint.cs" />
@@ -144,10 +163,12 @@
       <DependentUpon>DefaultTopBar.xaml</DependentUpon>
     </Compile>
     <Compile Include="Data\Gps.cs" />
-    <Compile Include="HelpScreen\HelpItem.cs" />
     <Compile Include="HelpScreen\HelpPage.xaml.cs">
       <DependentUpon>HelpPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="HelpScreen\HelpScreenPage.xaml.cs">
+      <DependentUpon>HelpScreenPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
@@ -160,6 +181,7 @@
     <Compile Include="MapScreen\WpDetailPage.xaml.cs">
       <DependentUpon>WpDetailPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Notification.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RouteSelectScreen\BoolToString.cs" />
     <Compile Include="RouteSelectScreen\Converter.cs" />
@@ -211,6 +233,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="HelpScreen\HelpScreenPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -248,10 +274,17 @@
     <Folder Include="Controller\" />
     <Folder Include="View\" />
   </ItemGroup>
+  <ItemGroup>
+    <XliffResource Include="MultilingualResources\Breda-Tour.en-US.xlf" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets" Label="MultilingualAppToolkit" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" />
+  <Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" Label="MultilingualAppToolkit">
+    <Warning Text="$(MSBuildProjectFile) is Multilingual build enabled, but the Multilingual App Toolkit is unavailable during the build. If building with Visual Studio, please check to ensure that toolkit is properly installed." />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

+ 9 - 0
Breda-Tour/CustomControls/DefaultPivotControl.xaml

@@ -11,6 +11,7 @@
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="*"/>
             <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
         <RadioButton 
             x:Name="RouteSelectRadioButton"
@@ -36,6 +37,14 @@
             Grid.Column="2"
             Checked="SettingsRadioButton_Checked"
             Height="50"/>
+        <RadioButton 
+            HorizontalAlignment="Stretch"
+            x:Name="HelpRadioButton"
+            Style="{StaticResource MainNavigationButtonStyle}"
+            Content="{StaticResource SymbolHelp}"
+            Grid.Column="3"
+            Checked="HelpRadioButton_Checked"
+            Height="50"/>
     </Grid>
     
 </UserControl>

+ 10 - 1
Breda-Tour/CustomControls/DefaultPivotControl.xaml.cs

@@ -28,7 +28,8 @@ namespace Breda_Tour.CustomControls
         {
             RouteSelected,
             Map,
-            Settings
+            Settings,
+            Help
         }
 
         public void SetCheckedButton(Tab selected)
@@ -44,6 +45,9 @@ namespace Breda_Tour.CustomControls
                 case Tab.Settings:
                     SettingsRadioButton.IsChecked = true;
                     break;
+                case Tab.Help:
+                    HelpRadioButton.IsChecked = true;
+                    break;
             }
         }
 
@@ -66,5 +70,10 @@ namespace Breda_Tour.CustomControls
         {
             MainPage.RootFrame.Navigate(typeof(Breda_Tours.SettingsScreen.SettingsPage));
         }
+
+        private void HelpRadioButton_Checked(object sender, RoutedEventArgs e)
+        {
+            MainPage.RootFrame.Navigate(typeof(HelpScreen.HelpScreenPage));
+        }
     }
 }

+ 22 - 0
Breda-Tour/Data/HelpItem.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Breda_Tour.Data
+{
+    public class HelpItem
+    {
+        public string Title { get; private set; }
+        public string Language { get; private set; }
+        public List<HelpItemStep> HelpItemSteps { get; private set; }
+
+        public HelpItem(string Language, string Title, List<HelpItemStep> Steps)
+        {
+            this.Language = Language;
+            this.Title = Title;
+            this.HelpItemSteps = Steps;
+        }
+    }
+}

+ 23 - 0
Breda-Tour/Data/HelpItemStep.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Breda_Tour.Data
+{
+    public class HelpItemStep
+    {
+        public string Title { get; private set; }
+        public string Description { get; private set; }
+        public string ImageSource { get; private set; }
+
+        public HelpItemStep(string Title, string Description, string ImageSource)
+        {
+            this.Title = Title;
+            this.Description = Description;
+            this.ImageSource = "ms-appx:///Storage/helpimages/"+ImageSource;
+        }
+
+    }
+}

+ 46 - 0
Breda-Tour/Data/HelpPageDatabase.cs

@@ -0,0 +1,46 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Breda_Tour.Data
+{ 
+
+    public class HelpPageDatabase
+    {
+        public ObservableCollection<HelpItem> HelpItems;
+        
+        public HelpPageDatabase()
+        {
+            HelpItems = new ObservableCollection<HelpItem>();
+            readHelpItems();
+        }
+
+        private void readHelpItems()
+        {
+            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()));
+            }
+        }
+
+        public ObservableCollection<HelpItem> GetCurrentHelpItems()
+        {
+            ObservableCollection<HelpItem> helpItems = new ObservableCollection<HelpItem>();
+            foreach(var item in HelpItems)
+            {
+                if (item.Language == App.Language)
+                    helpItems.Add(item);
+            }
+            return helpItems;
+        }
+    }
+}

+ 0 - 13
Breda-Tour/HelpScreen/HelpItem.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Breda_Tour.HelpScreen
-{
-    public class HelpItem
-    {
-        public string Title { get; set; }
-    }
-}

+ 22 - 6
Breda-Tour/HelpScreen/HelpPage.xaml

@@ -14,19 +14,35 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="75"/>
         </Grid.RowDefinitions>
-        <c:DefaultTopBar MySymbol="{StaticResource SymbolClose}" Header="HelpItem" />
-        <StackPanel Background="White" Grid.Row="1">
+        <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="{Binding Title}" FontWeight="Bold"/>
+                <Image
+                Name="HelpImage"
+                Height="400"
+                Source="{Binding ImageSource}"    
+                    >
 
-        </StackPanel>
+                </Image>
+                <TextBlock Margin="0,10,0,0" Text="Description" FontWeight="Bold"/>
+                <TextBlock Margin="0,10,0,0"
+                       TextWrapping="Wrap"
+                       Text="{Binding Description}">
+                </TextBlock>
+
+            </StackPanel>
+        </ScrollViewer>
+       
         <Grid Grid.Row="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
                 <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 x:Uid="HelpPagetxtBack" 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 x:Uid="HelpPagetxtNext" Tapped="PageForward_Tapped" Foreground="White" FontSize="18" Text="Next" Margin="0,0,20,0" HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Column="2"/>
         </Grid>
     </Grid>
 </Page>

+ 48 - 16
Breda-Tour/HelpScreen/HelpPage.xaml.cs

@@ -1,30 +1,62 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
+using Breda_Tour.Data;
+using Breda_Tours.SettingsScreen;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
-
 namespace Breda_Tour.HelpScreen
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </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];
+                if (App.Language == App.Languages[1])
+                {
+                    PageNumberTextBlock.Text = "Page " + (currentpage + 1) + " of " + helpitem.HelpItemSteps.Count;
+                }
+                else if (App.Language == App.Languages[0])
+                {
+                    PageNumberTextBlock.Text = "Pagina " + (currentpage + 1) + " van " + helpitem.HelpItemSteps.Count;
+                }
+                else
+                {
+                    PageNumberTextBlock.Text = "Page " + (currentpage + 1) + " of " + helpitem.HelpItemSteps.Count;
+                }
+            }
+        }
+
+        private void Close_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            MainPage.RootFrame.Navigate(typeof(HelpScreenPage));
+        }
+
+        private void PageBack_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            SetPage(currentpage - 1);
+        }
+        private void PageForward_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            SetPage(currentpage + 1);
+        }
     }
 }

+ 54 - 0
Breda-Tour/HelpScreen/HelpScreenPage.xaml

@@ -0,0 +1,54 @@
+<Page
+    x:Class="Breda_Tour.HelpScreen.HelpScreenPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Breda_Tour.HelpScreen"
+    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>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="*" ScrollViewer.VerticalScrollMode="Enabled"/>
+        </Grid.RowDefinitions>
+        <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>

+ 52 - 0
Breda-Tour/HelpScreen/HelpScreenPage.xaml.cs

@@ -0,0 +1,52 @@
+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;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace Breda_Tour.HelpScreen
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </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);
+        }
+    }
+}

+ 48 - 0
Breda-Tour/MultilingualResources/Breda-Tour.en-US.xlf

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
+  <file datatype="xml" source-language="nl-NL" target-language="en-US" original="BREDA-TOUR/NL-NL/RESOURCES.RESW" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
+    <header>
+      <tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.1517.0" tool-company="Microsoft" />
+    </header>
+    <body>
+      <group id="BREDA-TOUR/NL-NL/RESOURCES.RESW" datatype="resx">
+        <trans-unit id="AppSettingstxtSettings.Header" translate="yes" xml:space="preserve">
+          <source>Instellingen</source>
+          <target state="translated" state-qualifier="tm-suggestion">Settings</target>
+        </trans-unit>
+        <trans-unit id="AppSettingstxtSetupLanguage.Text" translate="yes" xml:space="preserve">
+          <source>Taal instellen</source>
+          <target state="translated">Set up language</target>
+        </trans-unit>
+        <trans-unit id="AppSettingsHelp.Text" translate="yes" xml:space="preserve">
+          <source>Help</source>
+          <target state="translated" state-qualifier="tm-suggestion">Help</target>
+        </trans-unit>
+        <trans-unit id="AppSettingsLanguageSettings.Text" translate="yes" xml:space="preserve">
+          <source>Taal instellingen</source>
+          <target state="translated" state-qualifier="mt-suggestion">Language settings</target>
+        </trans-unit>
+        <trans-unit id="RouteSelectPagetxtSelectRoute.Header" translate="yes" xml:space="preserve">
+          <source>Route selecteren</source>
+          <target state="translated" state-qualifier="mt-suggestion">Select route</target>
+        </trans-unit>
+        <trans-unit id="HelpPagetxtBack.Text" translate="yes" xml:space="preserve">
+          <source>Vorige</source>
+          <target state="translated">Back</target>
+        </trans-unit>
+        <trans-unit id="HelpPagetxtNext.Text" translate="yes" xml:space="preserve">
+          <source>Volgende</source>
+          <target state="translated">Next</target>
+        </trans-unit>
+        <trans-unit id="AppSettingstxtLanguageString.Text" translate="yes" xml:space="preserve">
+          <source>Nederlands</source>
+          <target state="translated">English</target>
+        </trans-unit>
+        <trans-unit id="HelpScreenPagetxtHelpScreen.Header" translate="yes" xml:space="preserve">
+          <source>Help</source>
+          <target state="translated" state-qualifier="tm-suggestion">Help</target>
+        </trans-unit>
+      </group>
+    </body>
+  </file>
+</xliff>

+ 47 - 0
Breda-Tour/Notification.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.Data.Xml.Dom;
+using Windows.UI.Notifications;
+
+namespace Breda_Tour
+{
+    class Notification
+    {
+        public Notification(string title, string message)
+        {
+            sendNote(standardNotification(title, message));
+        }
+
+        public string standardNotification(string title, string message)
+        {
+            return $@"
+            <toast activationType='foreground' launch='args'>
+                <visual>
+                    <binding template='ToastGeneric'>
+                        <text>{ title }</text>
+                        <text>{ message }</text>
+                    </binding>
+                </visual>
+            </toast>";
+
+        }
+
+        public void sendNote(string content)
+        {
+
+            // Notificatie moet in een XML formaat aangeleverd worden
+            XmlDocument doc = new XmlDocument();
+            // Onze XAML code erin zetten
+            doc.LoadXml(content);
+            // Inladen in een toast notificatie (Standaard in Windows 10)
+            ToastNotification notification = new ToastNotification(doc);
+            // Toast Manager aanmaken, oproepen en bewaren
+            ToastNotifier notifier = ToastNotificationManager.CreateToastNotifier();
+            // Notificatie aanleveren aan manager, de manager toont vervolgens de notificatie
+            notifier.Show(notification);
+        }
+    }
+}

+ 1 - 1
Breda-Tour/RouteSelectScreen/RouteSelectPage.xaml

@@ -17,7 +17,7 @@
             <RowDefinition Height="50" />
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <c:DefaultTopBar Header="Route Selecteren"/>
+        <c:DefaultTopBar x:Uid="RouteSelectPagetxtSelectRoute" Header="Route Selecteren"/>
         <c:DefaultPivotControl x:Name="DefaultPivot" Grid.Row="1"/>
         <RelativePanel Grid.Row="2" Margin="0,5">
             <RelativePanel.Resources>

+ 14 - 36
Breda-Tour/SettingsScreen/SettingsPage.xaml

@@ -6,7 +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.HelpScreen"
+    xmlns:data="using:Breda_Tour.Data"
     mc:Ignorable="d">
     <Grid Background="Transparent">
         <Grid.RowDefinitions>
@@ -14,46 +14,24 @@
             <RowDefinition Height="50"/>
             <RowDefinition Height="*" ScrollViewer.VerticalScrollMode="Enabled"/>
         </Grid.RowDefinitions>
-        <c:DefaultTopBar Header="Instellingen"/>
+        <c:DefaultTopBar Header="Instellingen" x:Uid="AppSettingstxtSettings"/>
         <c:DefaultPivotControl x:Name="DefaultPivot" Grid.Row="1"/>
         <ScrollViewer Grid.Row="2" VerticalScrollBarVisibility="Hidden">
-            <StackPanel Orientation="Vertical">
-                <TextBlock Style="{StaticResource SettingsHeaderStyle}" Foreground="White" Text="{StaticResource AppSettingsLanguageSettings}"></TextBlock>
-                <ListViewItem>
+            <StackPanel Orientation="Vertical" Background="White">
+                <TextBlock x:Uid="AppSettingsLanguageSettings"  Style="{StaticResource SettingsHeaderStyle}" Foreground="{StaticResource BredaToursMainColorBrush}" Text="{StaticResource AppSettingsLanguageSettings}"></TextBlock>
+                <ListViewItem Name="listViewItemSetupLanguage" Tapped="listViewItemSetupLanguage_Tapped">
                     <StackPanel Margin="8,0,0,0">
-                        <TextBlock FontSize="18" Text="Taal instellen" Foreground="White"></TextBlock>
-                        <TextBlock Margin="0,-1,0,0" FontSize="12" Foreground="White" Text="{StaticResource AppLanguageDutch}"></TextBlock>
+                        <TextBlock x:Uid="AppSettingstxtSetupLanguage" FontSize="18" Text="Taal instellen" ></TextBlock>
+                        <TextBlock x:Uid="AppSettingstxtLanguageString" Margin="0,-1,0,0" FontSize="12"  Text="Nederlands"></TextBlock>
+                    </StackPanel>
+                </ListViewItem>
+                <Rectangle Margin="0,15,0,15" Fill="#99000000" Height="1" />
+                <ListViewItem Name="listViewItemReset" Tapped="listViewItemReset_Tapped">
+                    <StackPanel Margin="8,0,0,0">
+                        <TextBlock x:Uid="AppSettingstxtReset" FontSize="18" Text="Applicatie resetten" Foreground="#ec0000" ></TextBlock>
+                        <TextBlock x:Uid="AppSettingstxtReset" Margin="0,-1,0,0" FontSize="12"  Text="Route afsluiten en applicatie naar basis instellingen resetten" Foreground="#ec0000"></TextBlock>
                     </StackPanel>
                 </ListViewItem>
-                <Rectangle Margin="0,15,0,0" Fill="#99FFFFFF" Height="1" />
-                <TextBlock Style="{StaticResource SettingsHeaderStyle}" Foreground="White" Text="{StaticResource AppSettingsHelp}"></TextBlock>
-                <ListView ItemsSource="{x:Bind HelpItems}" >
-                    <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="White" StrokeThickness="0.5"
-                                         Margin="5"
-                                         Name="FolderEllipse"/>
-                                    <SymbolIcon Symbol="Folder"
-                                                
-                                            Foreground="White"
-                                            Margin="10"
-                                            >
-                                        <SymbolIcon.RenderTransform>
-                                            <RotateTransform Angle="270" CenterX="15" CenterY="15"/>
-                                        </SymbolIcon.RenderTransform>
-                                    </SymbolIcon>
-                                    <TextBlock RelativePanel.RightOf="FolderEllipse" Foreground="White" Margin="10,14" Text="{x:Bind Title}" Grid.Column="1"/>
-                                </Grid>
-                            </ListBoxItem>
-                        </DataTemplate>
-                    </ListView.ItemTemplate>
-                </ListView>
             </StackPanel>
         </ScrollViewer>
     </Grid>

+ 21 - 19
Breda-Tour/SettingsScreen/SettingsPage.xaml.cs

@@ -8,6 +8,7 @@ using System.Runtime.InteropServices.WindowsRuntime;
 using Breda_Tour;
 
 using Breda_Tour.HelpScreen;
+using Breda_Tour.Data;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 using Windows.UI.Xaml;
@@ -17,6 +18,8 @@ using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
+using Windows.Globalization;
+using Breda_Tour.SplashScreen;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -27,28 +30,27 @@ 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);
-            HelpItems = new ObservableCollection<HelpItem>();
-            for (int i = 0; i < 10; i++)
-                HelpItems.Add(new HelpItem
-                {
-                    Title = "HelpItem" + i
-                });
-            DataContext = this;
+        }		
+        private void listViewItemSetupLanguage_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            if (App.Language == App.Languages[0])
+            {
+                App.Language = App.Languages[1];
+                Frame.Navigate(typeof(MainPage));
+            }
+            else
+            {
+                App.Language = App.Languages[0];
+                Frame.Navigate(typeof(MainPage));
+            }
+        }
+        private void listViewItemReset_Tapped(object sender, TappedRoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(SplashPage));
         }
-
     }
 }

+ 2 - 2
Breda-Tour/SplashScreen/SplashPage.xaml

@@ -45,11 +45,11 @@
             <Button Style="{StaticResource SplashScreenLanguageButtonStyle}"
                     Content="{StaticResource AppLanguageDutch}"
                     Margin="0,15,0,0"
-                    Click="Button_Click"/>
+                    Click="Button_Dutch_Click"/>
             <Button Style="{StaticResource SplashScreenLanguageButtonStyle}"
                     Content="{StaticResource AppLanguageEnglish}"
                     Margin="0,10,0,0"
-                    Click="Button_Click"/>
+                    Click="Button_English_Click"/>
         </StackPanel>
 
         <!--Language selection-->

+ 23 - 1
Breda-Tour/SplashScreen/SplashPage.xaml.cs

@@ -13,6 +13,7 @@ using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
+using Windows.Globalization;
 
 // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -29,6 +30,7 @@ namespace Breda_Tour.SplashScreen
         public SplashPage()
         {
             this.InitializeComponent();
+            new Notification("Hallo", "Test");
         }
 
         /// <author>Jannick van Ballegooijen</author>
@@ -37,6 +39,26 @@ namespace Breda_Tour.SplashScreen
         {
             f.Navigate(typeof(MainPage));
         }
-        
+
+        /// <summary>
+        /// <author>Bart Reedijk</author>
+        /// Go to MainPage with English as the language
+        /// </summary>
+        private void Button_English_Click(object sender, RoutedEventArgs e)
+        {
+            App.Language = App.Languages[1];
+            f.Navigate(typeof(MainPage));
+        }
+
+        /// <summary>
+        /// <author>Bart Reedijk</author>
+        /// Go to MainPage with Dutch as the language
+        /// </summary>
+        private void Button_Dutch_Click(object sender, RoutedEventArgs e)
+        {
+            App.Language = App.Languages[0];
+            f.Navigate(typeof(MainPage));
+        }
+
     }
 }

BIN
Breda-Tour/Storage/helpimages/taal_1.jpg


BIN
Breda-Tour/Storage/helpimages/taal_2.jpg


+ 46 - 0
Breda-Tour/Storage/helpitems/helpitems.json

@@ -0,0 +1,46 @@
+{
+  "HelpItems": [
+        {
+            "Language" : "nl-NL",
+            "Title" : "Taal selecteren",
+            "Steps" : [
+                {
+                    "Title":"Ga naar het instellingen menu",
+                    "Description":"Druk hiervoor op het 3e icoontje bovenin het menu. ",
+                    "ImageSource" :"taal_1.jpg"
+                },
+                {
+                    "Title":"Druk op taal instellen / set language",
+                    "Description":"Eerste optie in het menu.",
+                    "ImageSource" :"taal_2.jpg"
+                },
+                {
+                    "Title":"Selecteer de gewenste taal",
+                    "Description":"Hier kunt u kiezen uit de beschikbare talen van deze applicatie.",
+                    "ImageSource" :"taal_3.jpg"
+                }
+            ] 
+        },
+        {
+			      "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" :"taal_1.jpg"
+                },
+                {
+                    "Title":"Press on taal instellen / set language",
+                    "Description":"First option in the menu",
+                    "ImageSource" :"taal_2.jpg"
+                },
+                {
+                    "Title":"Select the preferred language",
+                    "Description":"Here you can choose between the available languages of the application.",
+                    "ImageSource" :"taal_3.jpg"
+                }
+            ]
+		}
+    ]
+}

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 130
Breda-Tour/Storage/routes/routes.json


+ 42 - 0
Breda-Tour/en-US/Resources.resw

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AppSettingstxtSettings.Header" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="AppSettingstxtSetupLanguage.Text" xml:space="preserve">
+    <value>Set up language</value>
+  </data>
+  <data name="AppSettingsHelp.Text" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="AppSettingsLanguageSettings.Text" xml:space="preserve">
+    <value>Language settings</value>
+  </data>
+  <data name="RouteSelectPagetxtSelectRoute.Header" xml:space="preserve">
+    <value>Select route</value>
+  </data>
+  <data name="HelpPagetxtBack.Text" xml:space="preserve">
+    <value>Back</value>
+  </data>
+  <data name="HelpPagetxtNext.Text" xml:space="preserve">
+    <value>Next</value>
+  </data>
+  <data name="AppSettingstxtLanguageString.Text" xml:space="preserve">
+    <value>English</value>
+  </data>
+  <data name="HelpScreenPagetxtHelpScreen.Header" xml:space="preserve">
+    <value>Help</value>
+  </data>
+</root>

+ 147 - 0
Breda-Tour/nl-NL/Resources.resw

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AppSettingsHelp.Text" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="AppSettingsLanguageSettings.Text" xml:space="preserve">
+    <value>Taal instellingen</value>
+  </data>
+  <data name="AppSettingstxtLanguageString.Text" xml:space="preserve">
+    <value>Nederlands</value>
+  </data>
+  <data name="AppSettingstxtSettings.Header" xml:space="preserve">
+    <value>Instellingen</value>
+  </data>
+  <data name="AppSettingstxtSetupLanguage.Text" xml:space="preserve">
+    <value>Taal instellen</value>
+  </data>
+  <data name="HelpPagetxtBack.Text" xml:space="preserve">
+    <value>Vorige</value>
+  </data>
+  <data name="HelpPagetxtNext.Text" xml:space="preserve">
+    <value>Volgende</value>
+  </data>
+  <data name="HelpScreenPagetxtHelpScreen.Header" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="RouteSelectPagetxtSelectRoute.Header" xml:space="preserve">
+    <value>Route selecteren</value>
+  </data>
+</root>

+ 1 - 1
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",

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff