Ver Fonte

Merge remote-tracking branch 'origin/MultiLanguage' into MultiLanguage

Bart Reedijk há 10 anos atrás
pai
commit
bd685a041f

+ 3 - 6
Breda-Tour/RouteSelectScreen/RouteExample.xaml.cs

@@ -42,16 +42,13 @@ namespace Breda_Tour.RouteSelectScreen
             MapService.ServiceToken =
                 "P4P2fAwXuk7ndsVIsaaV~uYjur55RgwmLsiwFwd72bQ~ApDRixf1L-0o_kMY8EtBBDm8xe7G2oz1k2-u0HQIATvSp-iiKr5KLNkYc1HF5D5e";
             InitializeComponent();
-            NavigationCacheMode = NavigationCacheMode.Enabled;
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (route == null)
-            {
-                route = e.Parameter as Route;
-                ShowRouteInfo();
-            }
+        
+            route = e.Parameter as Route;
+            ShowRouteInfo();
             //Setting the back button functionality
             SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = AppViewBackButtonVisibility.Visible;
             SystemNavigationManager.GetForCurrentView().BackRequested += BackRequested;

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

@@ -47,6 +47,7 @@ namespace Breda_Tour.RouteSelectScreen
         {
             SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = AppViewBackButtonVisibility.Collapsed;
             CurrentRoutes = AllRoutes.GetCurrentRoutes();
+            System.Diagnostics.Debug.WriteLine(CurrentRoutes[0].Language);
         }
 
         private void Routes_ItemClick(object sender, ItemClickEventArgs e)

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