Avans/NavCityBreda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
kennyboy55
2015-12-26 15:22:20 +01:00
parent 65123d0ef1
commit 429f1b8df3
30 changed files with 156 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NavCityBreda/App.xaml.cs
-3
View File
@@ -12,9 +12,6 @@ using Windows.UI.Xaml.Navigation;
namespace NavCityBreda
{
/// <summary>
/// Provides application-specific behavior to supplement the default Application class.
/// </summary>
sealed partial class App : Application
{
NavCityBreda/Helpers/Settings.cs
+2 -1
View File
@@ -12,7 +12,8 @@ namespace NavCityBreda.Helpers
public delegate void OnLanguageUpdateHandler(EventArgs e);
public static event OnLanguageUpdateHandler OnLanguageUpdate;
public static bool Tracking {
public static bool Tracking
{
get
{
return (bool)LOCAL_SETTINGS.Values["tracking"];
NavCityBreda/Helpers/Util.cs
+2 -1
View File
@@ -19,7 +19,8 @@ namespace NavCityBreda.Helpers
public static ResourceLoader Loader
{
get {
get
{
return new Windows.ApplicationModel.Resources.ResourceLoader();
}
}
NavCityBreda/InitPage.xaml.cs
-5
View File
@@ -7,13 +7,8 @@ using Windows.UI.Core;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
namespace NavCityBreda
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class InitPage : Page
{
internal Rect splashImageRect; // Rect to store splash screen image coordinates.
NavCityBreda/MainPage.xaml
+1 -1
View File
@@ -55,7 +55,6 @@
<Viewbox RelativePanel.RightOf="NavButton" RelativePanel.AlignBottomWith="NavButton" StretchDirection="DownOnly" Stretch="UniformToFill" Margin="10,0,10,0">
<TextBlock FontSize="28" Name="PageTitle" Text="{Binding Map}" />
</Viewbox>
</RelativePanel>
<!-- http://stackoverflow.com/questions/32108362/uwp-swipe-to-open-splitview-pane-->
@@ -126,6 +125,7 @@
</StackPanel>
</RelativePanel>
</SplitView.Pane>
<SplitView.Content>
<Grid>
<Frame Name="Frame"/>
NavCityBreda/MainPage.xaml.cs
-5
View File
@@ -10,13 +10,8 @@ using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Navigation;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
namespace NavCityBreda
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class MainPage : Page
{
double bptime;
NavCityBreda/Model/GeoTracker.cs
+2 -1
View File
@@ -73,7 +73,8 @@ namespace NavCityBreda.Model
switch (accessStatus)
{
case GeolocationAccessStatus.Allowed:
geo = new Geolocator {
geo = new Geolocator
{
DesiredAccuracy = PositionAccuracy.High,
MovementThreshold = 3
//ReportInterval = 1500
NavCityBreda/Model/RouteManager.cs
-1
View File
@@ -1,7 +1,6 @@
using NavCityBreda.Helpers;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
NavCityBreda/ViewModels/LandmarkVM.cs
-1
View File
@@ -1,7 +1,6 @@
using NavCityBreda.Helpers;
using NavCityBreda.Helpers.Comparer;
using NavCityBreda.Model;
using System;
using System.Collections.Generic;
namespace NavCityBreda.ViewModels
NavCityBreda/ViewModels/MapVM.cs
+4 -7
View File
@@ -5,11 +5,6 @@ namespace NavCityBreda.ViewModels
{
public class MapVM : TemplateVM
{
//In een route de MapLegs gaan bijhouden. Dan de eerste als current instellen.
//Dan kan je daarvan de informatie laten zien. Ook een event toevoegen als je dan aan het einde bent, dat weet je door lon-lon > 0.? te doen elke positie update.
//Allemaal in RouteManager afhandelen
//Nog een manier vinden om van een route afwijken op te vangen en dan opnieuw de route te berekenen.
public MapVM() : base(Util.Loader.GetString("Map"))
{
App.RouteManager.OnManeuverChanged += RouteManager_OnManeuverChanged;
@@ -24,14 +19,16 @@ namespace NavCityBreda.ViewModels
private void RouteManager_OnStatusUpdate(object sender, Model.RouteStatusChangedEventArgs e)
{
dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => {
dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
{
NotifyPropertyChanged(nameof(Instructions));
});
}
private void RouteManager_OnManeuverChanged(object sender, Model.ManeuverChangedEventArgs e)
{
dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => {
dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
{
NotifyPropertyChanged(nameof(Landmark));
NotifyPropertyChanged(nameof(Maneuver));
});
NavCityBreda/Views/HelpView.xaml.cs
-5
View File
@@ -1,13 +1,8 @@
using NavCityBreda.ViewModels;
using Windows.UI.Xaml.Controls;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
namespace NavCityBreda.Views
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class HelpView : Page
{
HelpVM helpvm;
NavCityBreda/Views/LandmarkDetailView.xaml.cs
-5
View File
@@ -3,13 +3,8 @@ using NavCityBreda.ViewModels;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
namespace NavCityBreda.Views
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class LandmarkDetailView : Page
{
LandmarkDetailVM landmarkvm;
NavCityBreda/Views/MapView.xaml.cs
-5
View File
@@ -17,13 +17,8 @@ using System.Threading.Tasks;
using Windows.Devices.Geolocation.Geofencing;
using Windows.UI.Core;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
namespace NavCityBreda.Views
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class MapView : Page
{
MapIcon CurrentPosition;
NavCityBreda/Views/RouteDetailView.xaml.cs
+4 -8
View File
@@ -9,13 +9,8 @@ using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Maps;
using Windows.UI.Xaml.Navigation;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
namespace NavCityBreda.Views
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class RouteDetailView : Page
{
private Route route;
@@ -41,12 +36,13 @@ namespace NavCityBreda.Views
{
routedetailvm.UpdateRoute();
LandmarkList.SelectedIndex = -1;
return;
}
else
{
route = r;
routedetailvm = new RouteDetailVM(route);
this.DataContext = routedetailvm;
}
DrawRoute();
}
@@ -57,7 +53,7 @@ namespace NavCityBreda.Views
Zoom();
await Task.Delay(TimeSpan.FromMilliseconds(10));
await Task.Delay(TimeSpan.FromMilliseconds(25));
MapPolyline m = Util.GetRouteLine(route.RouteObject, Color.FromArgb(255, 100, 100, 255), 25, 6);
Map.MapElements.Add(m);
NavCityBreda/Views/RouteView.xaml.cs
-5
View File
@@ -2,13 +2,8 @@
using NavCityBreda.ViewModels;
using Windows.UI.Xaml.Controls;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
namespace NavCityBreda.Views
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class RouteView : Page
{
RouteVM routevm;
NavCityBreda/Views/SettingsView.xaml.cs
-8
View File
@@ -1,19 +1,12 @@
using NavCityBreda.Helpers;
using NavCityBreda.ViewModels;
using System;
using System.Diagnostics;
using Windows.UI.Popups;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
namespace NavCityBreda.Views
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public sealed partial class SettingsView : Page
{
SettingsVM settingsvm;
@@ -23,7 +16,6 @@ namespace NavCityBreda.Views
this.InitializeComponent();
settingsvm = new SettingsVM();
this.DataContext = settingsvm;
//throw new NotImplementedException("Tracking + tilemaps");
}
protected override void OnNavigatedTo(NavigationEventArgs e)