From 19647d8b7de1f12c4a7d69cd5a7c060b4f4dd95b Mon Sep 17 00:00:00 2001 From: Christian Arenas Date: Mon, 12 Jun 2017 20:22:38 +0200 Subject: [PATCH] Add userIsLogged contiditon in view for fake location --- .../ViewModels/LoginViewModel.cs | 4 +++- .../ViewModels/SettingsViewModel.cs | 5 ++++- .../eShopOnContainers.Core/Views/SettingsView.xaml | 12 +++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs index c174e36c8..95d2c8556 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs @@ -215,8 +215,10 @@ namespace eShopOnContainers.Core.ViewModels if(Settings.UseMocks) { Settings.AuthAccessToken = string.Empty; - Settings.AuthIdToken = string.Empty; + Settings.AuthIdToken = string.Empty; } + + Settings.UseFakeLocation = false; } private async Task NavigateAsync(string url) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs index 8bfe9ed25..33188a96c 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs @@ -140,6 +140,8 @@ namespace eShopOnContainers.Core.ViewModels } } + public bool UserIsLogged => !string.IsNullOrEmpty(Settings.AuthAccessToken); + public ICommand ToggleMockServicesCommand => new Command(async () => await ToggleMockServicesAsync()); public ICommand ToggleFakeLocationCommand => new Command(() => ToggleFakeLocationAsync()); @@ -194,8 +196,9 @@ namespace eShopOnContainers.Core.ViewModels Latitude = _latitude, Longitude = _longitude }; + var authToken = Settings.AuthAccessToken; - await _locationService.UpdateUserLocation(locationRequest); + await _locationService.UpdateUserLocation(locationRequest, authToken); } private void UpdateInfo() diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml index a8da35daa..e374af1a7 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml @@ -163,7 +163,8 @@ Grid.ColumnSpan="2"/> + Grid.Row="4" + IsVisible="{Binding UserIsLogged}">