ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #469 from dotnet-architecture/xamarin-settings

Browse Source 
Replaced Plugin.Settings with unit testable SettingsService (mobile app)
This commit is contained in:
David Britch 2018-01-17 13:33:02 +00:00 committed by GitHub
commit aa27758607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
81 changed files with 1036 additions and 770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs
View File

@ -1,11 +1,11 @@
using System.Globalization;
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Services;
using eShopOnContainers.Core.ViewModels.Base;
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Location;
using eShopOnContainers.Core.Models.Location;
using eShopOnContainers.Core.Services.Location;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Services;
using Plugin.Geolocator;
using System.Globalization;
using System.Threading.Tasks;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -14,6 +14,8 @@ namespace eShopOnContainers
{
public partial class App : Application
{
ISettingsService _settingsService;
public App()
{
InitializeComponent();
@ -27,9 +29,9 @@ namespace eShopOnContainers
private void InitApp()
{
bool useMockServices = Settings.UseMocks;
if (!useMockServices)
ViewModelLocator.UpdateDependencies(useMockServices);
_settingsService = ViewModelLocator.Resolve<ISettingsService>();
if (!_settingsService.UseMocks)
ViewModelLocator.UpdateDependencies(_settingsService.UseMocks);
}
private Task InitNavigation()
@ -47,12 +49,12 @@ namespace eShopOnContainers
await InitNavigation();
}
if (Settings.AllowGpsLocation && !Settings.UseFakeLocation)
if (_settingsService.AllowGpsLocation && !_settingsService.UseFakeLocation)
{
await GetGpsLocation();
}
if (!Settings.UseMocks && !string.IsNullOrEmpty(Settings.AuthAccessToken))
if (!_settingsService.UseMocks && !string.IsNullOrEmpty(_settingsService.AuthAccessToken))
{
await SendCurrentLocation();
}
@ -76,12 +78,12 @@ namespace eShopOnContainers
var position = await locator.GetPositionAsync();
Settings.Latitude = position.Latitude.ToString();
Settings.Longitude = position.Longitude.ToString();
_settingsService.Latitude = position.Latitude.ToString();
_settingsService.Longitude = position.Longitude.ToString();
}
else
{
Settings.AllowGpsLocation = false;
_settingsService.AllowGpsLocation = false;
}
}
@ -89,13 +91,12 @@ namespace eShopOnContainers
{
var location = new Location
{
Latitude = double.Parse(Settings.Latitude, CultureInfo.InvariantCulture),
Longitude = double.Parse(Settings.Longitude, CultureInfo.InvariantCulture)
Latitude = double.Parse(_settingsService.Latitude, CultureInfo.InvariantCulture),
Longitude = double.Parse(_settingsService.Longitude, CultureInfo.InvariantCulture)
};
var locationService = ViewModelLocator.Resolve<ILocationService>();
await locationService.UpdateUserLocation(location,
Settings.AuthAccessToken);
await locationService.UpdateUserLocation(location, _settingsService.AuthAccessToken);
}
}
}

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/LineColorBehavior.cs
View File

@ -1,6 +1,6 @@
using System.Linq;
using eShopOnContainers.Core.Effects;
using System.Linq;
using Xamarin.Forms;
using eShopOnContainers.Core.Effects;
namespace eShopOnContainers.Core.Behaviors
{

6
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/ToggleButton.cs
View File

@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Threading.Tasks;
using System.Windows.Input;
using Xamarin.Forms;

6
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/Campaign.cs
View File

@ -1,7 +1,7 @@
namespace eShopOnContainers.Core.Models.Marketing
{
using System;
using System;
namespace eShopOnContainers.Core.Models.Marketing
{
public class Campaign
{
public int Id { get; set; }

6
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignItem.cs
View File

@ -1,7 +1,7 @@
namespace eShopOnContainers.Core.Models.Marketing
{
using System;
using System;
namespace eShopOnContainers.Core.Models.Marketing
{
public class CampaignItem
{
public int Id { get; set; }

6
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignRoot.cs
View File

@ -1,7 +1,7 @@
namespace eShopOnContainers.Core.Models.Marketing
{
using System.Collections.Generic;
using System.Collections.Generic;
namespace eShopOnContainers.Core.Models.Marketing
{
public class CampaignRoot
{
public int PageIndex { get; set; }

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/Order.cs
View File

@ -1,6 +1,6 @@
using System;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using Newtonsoft.Json;
namespace eShopOnContainers.Core.Models.Orders
{

14
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
View File

@ -2,18 +2,21 @@
using System.Threading.Tasks;
using eShopOnContainers.Core.Services.RequestProvider;
using eShopOnContainers.Core.Models.Basket;
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Services.FixUri;
namespace eShopOnContainers.Core.Services.Basket
{
public class BasketService : IBasketService
{
private readonly IRequestProvider _requestProvider;
private readonly IFixUriService _fixUriService;
private const string ApiUrlBase = "api/v1/basket";
public BasketService(IRequestProvider requestProvider)
public BasketService(IRequestProvider requestProvider, IFixUriService fixUriService)
{
_requestProvider = requestProvider;
_fixUriService = fixUriService;
}
public async Task<CustomerBasket> GetBasketAsync(string guidUser, string token)
@ -28,8 +31,7 @@ namespace eShopOnContainers.Core.Services.Basket
CustomerBasket basket =
await _requestProvider.GetAsync<CustomerBasket>(uri, token);
ServicesHelper.FixBasketItemPictureUri(basket?.Items);
_fixUriService.FixBasketItemPictureUri(basket?.Items);
return basket;
}
@ -41,9 +43,7 @@ namespace eShopOnContainers.Core.Services.Basket
};
var uri = builder.ToString();
var result = await _requestProvider.PostAsync(uri, customerBasket, token);
return result;
}
@ -55,7 +55,6 @@ namespace eShopOnContainers.Core.Services.Basket
};
var uri = builder.ToString();
await _requestProvider.PostAsync(uri, basketCheckout, token);
}
@ -67,7 +66,6 @@ namespace eShopOnContainers.Core.Services.Basket
};
var uri = builder.ToString();
await _requestProvider.DeleteAsync(uri, token);
}
}

29
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs
View File

@ -5,29 +5,28 @@ using eShopOnContainers.Core.Models.Catalog;
using eShopOnContainers.Core.Services.RequestProvider;
using eShopOnContainers.Core.Extensions;
using System.Collections.Generic;
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Services.FixUri;
namespace eShopOnContainers.Core.Services.Catalog
{
public class CatalogService : ICatalogService
{
private readonly IRequestProvider _requestProvider;
private readonly IFixUriService _fixUriService;
public CatalogService(IRequestProvider requestProvider)
public CatalogService(IRequestProvider requestProvider, IFixUriService fixUriService)
{
_requestProvider = requestProvider;
_fixUriService = fixUriService;
}
public async Task<ObservableCollection<CatalogItem>> FilterAsync(int catalogBrandId, int catalogTypeId)
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId);
string uri = builder.ToString();
CatalogRoot catalog =
await _requestProvider.GetAsync<CatalogRoot>(uri);
CatalogRoot catalog = await _requestProvider.GetAsync<CatalogRoot>(uri);
if (catalog?.Data != null)
return catalog?.Data.ToObservableCollection();
@ -38,18 +37,14 @@ namespace eShopOnContainers.Core.Services.Catalog
public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
builder.Path = "api/v1/catalog/items";
string uri = builder.ToString();
CatalogRoot catalog =
await _requestProvider.GetAsync<CatalogRoot>(uri);
CatalogRoot catalog = await _requestProvider.GetAsync<CatalogRoot>(uri);
if (catalog?.Data != null)
{
ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
_fixUriService.FixCatalogItemPictureUri(catalog?.Data);
return catalog?.Data.ToObservableCollection();
}
else
@ -59,13 +54,10 @@ namespace eShopOnContainers.Core.Services.Catalog
public async Task<ObservableCollection<CatalogBrand>> GetCatalogBrandAsync()
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
builder.Path = "api/v1/catalog/catalogbrands";
string uri = builder.ToString();
IEnumerable<CatalogBrand> brands =
await _requestProvider.GetAsync<IEnumerable<CatalogBrand>>(uri);
IEnumerable<CatalogBrand> brands = await _requestProvider.GetAsync<IEnumerable<CatalogBrand>>(uri);
if (brands != null)
return brands?.ToObservableCollection();
@ -76,13 +68,10 @@ namespace eShopOnContainers.Core.Services.Catalog
public async Task<ObservableCollection<CatalogType>> GetCatalogTypeAsync()
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
builder.Path = "api/v1/catalog/catalogtypes";
string uri = builder.ToString();
IEnumerable<CatalogType> types =
await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
IEnumerable<CatalogType> types = await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
if (types != null)
return types.ToObservableCollection();

10
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Dependency/DependencyService.cs Normal file
View File

@ -0,0 +1,10 @@
namespace eShopOnContainers.Core.Services.Dependency
{
public class DependencyService : IDependencyService
{
public T Get<T>() where T : class
{
return Xamarin.Forms.DependencyService.Get<T>();
}
}
}

7
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Dependency/IDependencyService.cs Normal file
View File

@ -0,0 +1,7 @@
namespace eShopOnContainers.Core.Services.Dependency
{
public interface IDependencyService
{
T Get<T>() where T : class;
}
}

32
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs → src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/FixUri/FixUriService.cs
View File

@ -6,14 +6,22 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text.RegularExpressions;
using eShopOnContainers.Core.Services.Settings;
namespace eShopOnContainers.Core.Helpers
namespace eShopOnContainers.Core.Services.FixUri
{
public static class ServicesHelper
public class FixUriService : IFixUriService
{
private static Regex IpRegex = new Regex(@"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b");
private readonly ISettingsService _settingsService;
public static void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItems)
private Regex IpRegex = new Regex(@"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b");
public FixUriService(ISettingsService settingsService)
{
_settingsService = settingsService;
}
public void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItems)
{
if (catalogItems == null)
{
@ -23,12 +31,12 @@ namespace eShopOnContainers.Core.Helpers
try
{
if (!ViewModelLocator.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
&& _settingsService.UrlBase != GlobalSetting.DefaultEndpoint)
{
foreach (var catalogItem in catalogItems)
{
MatchCollection serverResult = IpRegex.Matches(catalogItem.PictureUri);
MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
MatchCollection localResult = IpRegex.Matches(_settingsService.UrlBase);
if (serverResult.Count != -1 && localResult.Count != -1)
{
@ -46,7 +54,7 @@ namespace eShopOnContainers.Core.Helpers
}
}
public static void FixBasketItemPictureUri(IEnumerable<BasketItem> basketItems)
public void FixBasketItemPictureUri(IEnumerable<BasketItem> basketItems)
{
if (basketItems == null)
{
@ -56,12 +64,12 @@ namespace eShopOnContainers.Core.Helpers
try
{
if (!ViewModelLocator.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
&& _settingsService.UrlBase != GlobalSetting.DefaultEndpoint)
{
foreach (var basketItem in basketItems)
{
MatchCollection serverResult = IpRegex.Matches(basketItem.PictureUrl);
MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
MatchCollection localResult = IpRegex.Matches(_settingsService.UrlBase);
if (serverResult.Count != -1 && localResult.Count != -1)
{
@ -78,7 +86,7 @@ namespace eShopOnContainers.Core.Helpers
}
}
public static void FixCampaignItemPictureUri(IEnumerable<CampaignItem> campaignItems)
public void FixCampaignItemPictureUri(IEnumerable<CampaignItem> campaignItems)
{
if (campaignItems == null)
{
@ -88,12 +96,12 @@ namespace eShopOnContainers.Core.Helpers
try
{
if (!ViewModelLocator.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint)
&& _settingsService.UrlBase != GlobalSetting.DefaultEndpoint)
{
foreach (var campaignItem in campaignItems)
{
MatchCollection serverResult = IpRegex.Matches(campaignItem.PictureUri);
MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
MatchCollection localResult = IpRegex.Matches(_settingsService.UrlBase);
if (serverResult.Count != -1 && localResult.Count != -1)
{

14
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/FixUri/IFixUriService.cs Normal file
View File

@ -0,0 +1,14 @@
using System.Collections.Generic;
using eShopOnContainers.Core.Models.Basket;
using eShopOnContainers.Core.Models.Catalog;
using eShopOnContainers.Core.Models.Marketing;
namespace eShopOnContainers.Core.Services.FixUri
{
public interface IFixUriService
{
void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItems);
void FixBasketItemPictureUri(IEnumerable<BasketItem> basketItems);
void FixCampaignItemPictureUri(IEnumerable<CampaignItem> campaignItems);
}
}

9
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/ILocationService.cs
View File

@ -1,10 +1,9 @@
namespace eShopOnContainers.Core.Services.Location
{
using System.Threading.Tasks;
using Models.Location;
using System.Threading.Tasks;
namespace eShopOnContainers.Core.Services.Location
{
public interface ILocationService
{
Task UpdateUserLocation(Location newLocReq, string token);
Task UpdateUserLocation(eShopOnContainers.Core.Models.Location.Location newLocReq, string token);
}
}

11
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs
View File

@ -1,10 +1,9 @@
namespace eShopOnContainers.Core.Services.Location
{
using System;
using System;
using System.Threading.Tasks;
using Models.Location;
using RequestProvider;
using eShopOnContainers.Core.Services.RequestProvider;
namespace eShopOnContainers.Core.Services.Location
{
public class LocationService : ILocationService
{
private readonly IRequestProvider _requestProvider;
@ -14,7 +13,7 @@
_requestProvider = requestProvider;
}
public async Task UpdateUserLocation(Location newLocReq, string token)
public async Task UpdateUserLocation(eShopOnContainers.Core.Models.Location.Location newLocReq, string token)
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.LocationEndpoint);

6
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
View File

@ -1,9 +1,9 @@
using System;
using eShopOnContainers.Core.Models.Marketing;
using System;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using System.Linq;
using System.Threading.Tasks;
using Xamarin.Forms;
using eShopOnContainers.Core.Models.Marketing;
namespace eShopOnContainers.Core.Services.Marketing
{

25
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs
View File

@ -1,37 +1,35 @@
using System;
using eShopOnContainers.Core.Extensions;
using eShopOnContainers.Core.Models.Marketing;
using eShopOnContainers.Core.Services.FixUri;
using eShopOnContainers.Core.Services.RequestProvider;
using System;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Marketing;
using eShopOnContainers.Core.Services.RequestProvider;
using eShopOnContainers.Core.Extensions;
using eShopOnContainers.Core.Helpers;
namespace eShopOnContainers.Core.Services.Marketing
{
public class CampaignService : ICampaignService
{
private readonly IRequestProvider _requestProvider;
private readonly IFixUriService _fixUriService;
public CampaignService(IRequestProvider requestProvider)
public CampaignService(IRequestProvider requestProvider, IFixUriService fixUriService)
{
_requestProvider = requestProvider;
_fixUriService = fixUriService;
}
public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(string token)
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.MarketingEndpoint);
builder.Path = "api/v1/campaigns/user";
string uri = builder.ToString();
CampaignRoot campaign =
await _requestProvider.GetAsync<CampaignRoot>(uri, token);
CampaignRoot campaign = await _requestProvider.GetAsync<CampaignRoot>(uri, token);
if (campaign?.Data != null)
{
ServicesHelper.FixCampaignItemPictureUri(campaign?.Data);
_fixUriService.FixCampaignItemPictureUri(campaign?.Data);
return campaign?.Data.ToObservableCollection();
}
@ -41,11 +39,8 @@ namespace eShopOnContainers.Core.Services.Marketing
public async Task<CampaignItem> GetCampaignByIdAsync(int campaignId, string token)
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.MarketingEndpoint);
builder.Path = $"api/v1/campaigns/{campaignId}";
string uri = builder.ToString();
return await _requestProvider.GetAsync<CampaignItem>(uri, token);
}
}

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs
View File

@ -1,6 +1,6 @@
using System.Collections.ObjectModel;
using eShopOnContainers.Core.Models.Marketing;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Marketing;
namespace eShopOnContainers.Core.Services.Marketing
{

13
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs
View File

@ -1,7 +1,7 @@
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels;
using eShopOnContainers.Core.Views;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Views;
using System;
using System.Globalization;
using System.Reflection;
@ -12,6 +12,8 @@ namespace eShopOnContainers.Services
{
public class NavigationService : INavigationService
{
private readonly ISettingsService _settingsService;
public ViewModelBase PreviousPageViewModel
{
get
@ -22,9 +24,14 @@ namespace eShopOnContainers.Services
}
}
public NavigationService(ISettingsService settingsService)
{
_settingsService = settingsService;
}
public Task InitializeAsync()
{
if(string.IsNullOrEmpty(Settings.AuthAccessToken))
if (string.IsNullOrEmpty(_settingsService.AuthAccessToken))
return NavigateToAsync<LoginViewModel>();
else
return NavigateToAsync<MainViewModel>();

1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs
View File

@ -2,7 +2,6 @@
using System.Collections.ObjectModel;
using System.Threading.Tasks;
namespace eShopOnContainers.Core.Services.Order
{
public interface IOrderService

3
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
View File

@ -1,10 +1,9 @@
using eShopOnContainers.Core.Models.Basket;
using eShopOnContainers.Core.Models.Orders;
using eShopOnContainers.Core.Services.RequestProvider;
using System;
using System.Collections.ObjectModel;
using System.Net.Http;
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Orders;
namespace eShopOnContainers.Core.Services.Order
{

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/HttpRequestExceptionEx.cs
View File

@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
namespace eShopOnContainers.Core.Services.RequestProvider
{

2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs
View File

@ -2,11 +2,11 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using System;
using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Threading.Tasks;
using System;
namespace eShopOnContainers.Core.Services.RequestProvider
{

14
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Settings/ISettingsService.cs Normal file
View File

@ -0,0 +1,14 @@
namespace eShopOnContainers.Core.Services.Settings
{
public interface ISettingsService
{
string AuthAccessToken { get; set; }
string AuthIdToken { get; set; }
bool UseMocks { get; set; }
string UrlBase { get; set; }
bool UseFakeLocation { get; set; }
string Latitude { get; set; }
string Longitude { get; set; }
bool AllowGpsLocation { get; set; }
}
}

13
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Settings/ISettingsServiceImplementation.cs Normal file
View File

@ -0,0 +1,13 @@
namespace eShopOnContainers.Core.Services.Settings
{
public interface ISettingsServiceImplementation
{
bool GetValueOrDefault(string key, bool defaultValue);
string GetValueOrDefault(string key, string defaultValue);
bool AddOrUpdateValue(string key, bool value);
bool AddOrUpdateValue(string key, string value);
void Remove(string key);
}
}

56
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs → src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Settings/SettingsService.cs
View File

@ -1,21 +1,19 @@
using Plugin.Settings;
using Plugin.Settings.Abstractions;
using eShopOnContainers.Core.Services.Dependency;
namespace eShopOnContainers.Core.Helpers
namespace eShopOnContainers.Core.Services.Settings
{
/// <summary>
/// This is the Settings static class that can be used in your Core solution or in any
/// of your client applications. All settings are laid out the same exact way with getters
/// and setters.
/// </summary>
public static class Settings
public class SettingsService : ISettingsService
{
private static ISettings AppSettings
private readonly ISettingsServiceImplementation _settingsService;
ISettingsServiceImplementation AppSettings
{
get
{
return CrossSettings.Current;
get { return _settingsService; }
}
public SettingsService(IDependencyService dependencyService)
{
_settingsService = dependencyService.Get<ISettingsServiceImplementation>();
}
#region Setting Constants
@ -28,60 +26,60 @@ namespace eShopOnContainers.Core.Helpers
private const string IdLatitude = "latitude";
private const string IdLongitude = "longitude";
private const string IdAllowGpsLocation = "allow_gps_location";
private static readonly string AccessTokenDefault = string.Empty;
private static readonly string IdTokenDefault = string.Empty;
private static readonly bool UseMocksDefault = true;
private static readonly bool UseFakeLocationDefault = false;
private static readonly bool AllowGpsLocationDefault = false;
private static readonly double FakeLatitudeDefault = 47.604610d;
private static readonly double FakeLongitudeDefault = -122.315752d;
private static readonly string UrlBaseDefault = GlobalSetting.Instance.BaseEndpoint;
private readonly string AccessTokenDefault = string.Empty;
private readonly string IdTokenDefault = string.Empty;
private readonly bool UseMocksDefault = true;
private readonly bool UseFakeLocationDefault = false;
private readonly bool AllowGpsLocationDefault = false;
private readonly double FakeLatitudeDefault = 47.604610d;
private readonly double FakeLongitudeDefault = -122.315752d;
private readonly string UrlBaseDefault = GlobalSetting.Instance.BaseEndpoint;
#endregion
public static string AuthAccessToken
public string AuthAccessToken
{
get => AppSettings.GetValueOrDefault(AccessToken, AccessTokenDefault);
set => AppSettings.AddOrUpdateValue(AccessToken, value);
}
public static string AuthIdToken
public string AuthIdToken
{
get => AppSettings.GetValueOrDefault(IdToken, IdTokenDefault);
set => AppSettings.AddOrUpdateValue(IdToken, value);
}
public static bool UseMocks
public bool UseMocks
{
get => AppSettings.GetValueOrDefault(IdUseMocks, UseMocksDefault);
set => AppSettings.AddOrUpdateValue(IdUseMocks, value);
}
public static string UrlBase
public string UrlBase
{
get => AppSettings.GetValueOrDefault(IdUrlBase, UrlBaseDefault);
set => AppSettings.AddOrUpdateValue(IdUrlBase, value);
}
public static bool UseFakeLocation
public bool UseFakeLocation
{
get => AppSettings.GetValueOrDefault(IdUseFakeLocation, UseFakeLocationDefault);
set => AppSettings.AddOrUpdateValue(IdUseFakeLocation, value);
}
public static string Latitude
public string Latitude
{
get => AppSettings.GetValueOrDefault(IdLatitude, FakeLatitudeDefault.ToString());
set => AppSettings.AddOrUpdateValue(IdLatitude, value);
}
public static string Longitude
public string Longitude
{
get => AppSettings.GetValueOrDefault(IdLongitude, FakeLongitudeDefault.ToString());
set => AppSettings.AddOrUpdateValue(IdLongitude, value);
}
public static bool AllowGpsLocation
public bool AllowGpsLocation
{
get => AppSettings.GetValueOrDefault(IdAllowGpsLocation, AllowGpsLocationDefault);
set => AppSettings.AddOrUpdateValue(IdAllowGpsLocation, value);

5
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs
View File

@ -1,5 +1,5 @@
using System;
using eShopOnContainers.Core.Models.User;
using eShopOnContainers.Core.Models.User;
using System;
using System.Threading.Tasks;
namespace eShopOnContainers.Core.Services.User
@ -29,7 +29,6 @@ namespace eShopOnContainers.Core.Services.User
public async Task<UserInfo> GetUserInfoAsync(string authToken)
{
await Task.Delay(500);
return MockUserInfo;
}
}

10
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs
View File

@ -1,7 +1,7 @@
using eShopOnContainers.Core.Services.RequestProvider;
using eShopOnContainers.Core.Models.User;
using eShopOnContainers.Core.Services.RequestProvider;
using System;
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.User;
namespace eShopOnContainers.Core.Services.User
{
@ -17,12 +17,8 @@ namespace eShopOnContainers.Core.Services.User
public async Task<UserInfo> GetUserInfoAsync(string authToken)
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.UserInfoEndpoint);
string uri = builder.ToString();
var userInfo =
await _requestProvider.GetAsync<UserInfo>(uri, authToken);
var userInfo = await _requestProvider.GetAsync<UserInfo>(uri, authToken);
return userInfo;
}
}

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs
View File

@ -1,4 +1,4 @@
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Services;
using System.Threading.Tasks;
@ -29,7 +29,7 @@ namespace eShopOnContainers.Core.ViewModels.Base
{
DialogService = ViewModelLocator.Resolve<IDialogService>();
NavigationService = ViewModelLocator.Resolve<INavigationService>();
GlobalSetting.Instance.BaseEndpoint = Settings.UrlBase;
GlobalSetting.Instance.BaseEndpoint = ViewModelLocator.Resolve<ISettingsService>().UrlBase;
}
public virtual Task InitializeAsync(object navigationData)

33
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs
View File

@ -1,18 +1,21 @@
using eShopOnContainers.Services;
using eShopOnContainers.Core.Services.Basket;
using eShopOnContainers.Core.Services.Catalog;
using eShopOnContainers.Core.Services.Dependency;
using eShopOnContainers.Core.Services.FixUri;
using eShopOnContainers.Core.Services.Identity;
using eShopOnContainers.Core.Services.Location;
using eShopOnContainers.Core.Services.Marketing;
using eShopOnContainers.Core.Services.OpenUrl;
using eShopOnContainers.Core.Services.Order;
using eShopOnContainers.Core.Services.RequestProvider;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.Services.User;
using eShopOnContainers.Services;
using System;
using System.Globalization;
using System.Reflection;
using eShopOnContainers.Core.Services.Catalog;
using eShopOnContainers.Core.Services.OpenUrl;
using eShopOnContainers.Core.Services.RequestProvider;
using eShopOnContainers.Core.Services.Basket;
using eShopOnContainers.Core.Services.Identity;
using eShopOnContainers.Core.Services.Order;
using eShopOnContainers.Core.Services.User;
using Xamarin.Forms;
using eShopOnContainers.Core.Services.Location;
using eShopOnContainers.Core.Services.Marketing;
using TinyIoC;
using Xamarin.Forms;
namespace eShopOnContainers.Core.ViewModels.Base
{
@ -57,6 +60,9 @@ namespace eShopOnContainers.Core.ViewModels.Base
_container.Register<IOpenUrlService, OpenUrlService>();
_container.Register<IIdentityService, IdentityService>();
_container.Register<IRequestProvider, RequestProvider>();
_container.Register<IDependencyService, Services.Dependency.DependencyService>();
_container.Register<ISettingsService, SettingsService>().AsSingleton();
_container.Register<IFixUriService, FixUriService>().AsSingleton();
_container.Register<ILocationService, LocationService>().AsSingleton();
_container.Register<ICatalogService, CatalogMockService>().AsSingleton();
_container.Register<IBasketService, BasketMockService>().AsSingleton();
@ -90,6 +96,11 @@ namespace eShopOnContainers.Core.ViewModels.Base
}
}
public static void RegisterSingleton<TInterface, T>() where TInterface : class where T : class, TInterface
{
_container.Register<TInterface, T>().AsSingleton();
}
public static T Resolve<T>() where T : class
{
return _container.Resolve<T>();

14
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
View File

@ -1,7 +1,7 @@
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Models.Basket;
using eShopOnContainers.Core.Models.Basket;
using eShopOnContainers.Core.Models.Catalog;
using eShopOnContainers.Core.Services.Basket;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.Services.User;
using eShopOnContainers.Core.ViewModels.Base;
using System.Collections.ObjectModel;
@ -18,13 +18,16 @@ namespace eShopOnContainers.Core.ViewModels
private ObservableCollection<BasketItem> _basketItems;
private decimal _total;
private ISettingsService _settingsService;
private IBasketService _basketService;
private IUserService _userService;
public BasketViewModel(
ISettingsService settingsService,
IBasketService basketService,
IUserService userService)
{
_settingsService = settingsService;
_basketService = basketService;
_userService = userService;
}
@ -68,7 +71,7 @@ namespace eShopOnContainers.Core.ViewModels
if (BasketItems == null)
BasketItems = new ObservableCollection<BasketItem>();
var authToken = Settings.AuthAccessToken;
var authToken = _settingsService.AuthAccessToken;
var userInfo = await _userService.GetUserInfoAsync(authToken);
// Update Basket
@ -114,16 +117,13 @@ namespace eShopOnContainers.Core.ViewModels
private async Task AddItemAsync(BasketItem item)
{
BadgeCount++;
await AddBasketItemAsync(item);
RaisePropertyChanged(() => BasketItems);
}
private async Task AddBasketItemAsync(BasketItem item)
{
BasketItems.Add(item);
await ReCalculateTotalAsync();
}
@ -141,7 +141,7 @@ namespace eShopOnContainers.Core.ViewModels
Total += (orderItem.Quantity * orderItem.UnitPrice);
}
var authToken = Settings.AuthAccessToken;
var authToken = _settingsService.AuthAccessToken;
var userInfo = await _userService.GetUserInfoAsync(authToken);
await _basketService.UpdateBasketAsync(new CustomerBasket

27
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs
View File

@ -1,21 +1,26 @@
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Marketing;
using eShopOnContainers.Core.Services.Marketing;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels.Base;
using System.Threading.Tasks;
using System.Windows.Input;
using Xamarin.Forms;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Models.Marketing;
using eShopOnContainers.Core.Services.Marketing;
namespace eShopOnContainers.Core.ViewModels
{
public class CampaignDetailsViewModel : ViewModelBase
{
private CampaignItem _campaign;
private bool _isDetailsSite;
private readonly ISettingsService _settingsService;
private readonly ICampaignService _campaignService;
public CampaignDetailsViewModel(ICampaignService campaignService)
private CampaignItem _campaign;
private bool _isDetailsSite;
public ICommand EnableDetailsSiteCommand => new Command(EnableDetailsSite);
public CampaignDetailsViewModel(ISettingsService settingsService, ICampaignService campaignService)
{
_settingsService = settingsService;
_campaignService = campaignService;
}
@ -44,16 +49,12 @@ namespace eShopOnContainers.Core.ViewModels
if (navigationData is int)
{
IsBusy = true;
// Get campaign by id
Campaign = await _campaignService.GetCampaignByIdAsync((int)navigationData, Settings.AuthAccessToken);
Campaign = await _campaignService.GetCampaignByIdAsync((int)navigationData, _settingsService.AuthAccessToken);
IsBusy = false;
}
}
public ICommand EnableDetailsSiteCommand => new Command(EnableDetailsSite);
private void EnableDetailsSite()
{
IsDetailsSite = true;

23
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs
View File

@ -1,21 +1,24 @@
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Marketing;
using eShopOnContainers.Core.Services.Marketing;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels.Base;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using System.Windows.Input;
using Xamarin.Forms;
using System.Collections.ObjectModel;
using eShopOnContainers.Core.Models.Marketing;
using eShopOnContainers.Core.Services.Marketing;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Helpers;
namespace eShopOnContainers.Core.ViewModels
{
public class CampaignViewModel : ViewModelBase
{
private ObservableCollection<CampaignItem> _campaigns;
private readonly ISettingsService _settingsService;
private readonly ICampaignService _campaignService;
public CampaignViewModel(ICampaignService campaignService)
private ObservableCollection<CampaignItem> _campaigns;
public CampaignViewModel(ISettingsService settingsService, ICampaignService campaignService)
{
_settingsService = settingsService;
_campaignService = campaignService;
}
@ -34,10 +37,8 @@ namespace eShopOnContainers.Core.ViewModels
public override async Task InitializeAsync(object navigationData)
{
IsBusy = true;
// Get campaigns by user
Campaigns = await _campaignService.GetAllCampaignsAsync(Settings.AuthAccessToken);
Campaigns = await _campaignService.GetAllCampaignsAsync(_settingsService.AuthAccessToken);
IsBusy = false;
}

8
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs
View File

@ -1,10 +1,10 @@
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Catalog;
using eShopOnContainers.Core.Services.Catalog;
using eShopOnContainers.Core.ViewModels.Base;
using System.Collections.ObjectModel;
using Xamarin.Forms;
using eShopOnContainers.Core.Models.Catalog;
using eShopOnContainers.Core.Services.Catalog;
using System.Threading.Tasks;
using System.Windows.Input;
using Xamarin.Forms;
namespace eShopOnContainers.Core.ViewModels
{

33
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
View File

@ -1,18 +1,18 @@
using eShopOnContainers.Core.Models.Navigation;
using eShopOnContainers.Core.ViewModels.Base;
using System.Windows.Input;
using Xamarin.Forms;
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Basket;
using eShopOnContainers.Core.Models.Navigation;
using eShopOnContainers.Core.Models.Orders;
using System;
using System.Collections.ObjectModel;
using eShopOnContainers.Core.Models.Basket;
using System.Collections.Generic;
using eShopOnContainers.Core.Models.User;
using eShopOnContainers.Core.Services.Basket;
using eShopOnContainers.Core.Services.Order;
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.Services.User;
using eShopOnContainers.Core.Models.User;
using eShopOnContainers.Core.ViewModels.Base;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
using System.Windows.Input;
using Xamarin.Forms;
namespace eShopOnContainers.Core.ViewModels
{
@ -22,15 +22,18 @@ namespace eShopOnContainers.Core.ViewModels
private Order _order;
private Address _shippingAddress;
private ISettingsService _settingsService;
private IBasketService _basketService;
private IOrderService _orderService;
private IUserService _userService;
public CheckoutViewModel(
ISettingsService settingsService,
IBasketService basketService,
IOrderService orderService,
IUserService userService)
{
_settingsService = settingsService;
_basketService = basketService;
_orderService = orderService;
_userService = userService;
@ -79,7 +82,7 @@ namespace eShopOnContainers.Core.ViewModels
OrderItems = orderItems;
var authToken = Settings.AuthAccessToken;
var authToken = _settingsService.AuthAccessToken;
var userInfo = await _userService.GetUserInfoAsync(authToken);
// Create Shipping Address
@ -122,7 +125,7 @@ namespace eShopOnContainers.Core.ViewModels
Total = CalculateTotal(CreateOrderItems(orderItems))
};
if (Settings.UseMocks)
if (_settingsService.UseMocks)
{
// Get number of orders
var orders = await _orderService.GetOrdersAsync(authToken);
@ -140,7 +143,7 @@ namespace eShopOnContainers.Core.ViewModels
{
try
{
var authToken = Settings.AuthAccessToken;
var authToken = _settingsService.AuthAccessToken;
var basket = _orderService.MapOrderToBasket(Order);
basket.RequestId = Guid.NewGuid();
@ -148,7 +151,7 @@ namespace eShopOnContainers.Core.ViewModels
// Create basket checkout
await _basketService.CheckoutAsync(basket, authToken);
if (Settings.UseMocks)
if (_settingsService.UseMocks)
{
await _orderService.CreateOrderAsync(Order, authToken);
}

29
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
View File

@ -1,7 +1,7 @@
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Models.User;
using eShopOnContainers.Core.Models.User;
using eShopOnContainers.Core.Services.Identity;
using eShopOnContainers.Core.Services.OpenUrl;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.Validations;
using eShopOnContainers.Core.ViewModels.Base;
using IdentityModel.Client;
@ -22,13 +22,16 @@ namespace eShopOnContainers.Core.ViewModels
private bool _isLogin;
private string _authUrl;
private ISettingsService _settingsService;
private IOpenUrlService _openUrlService;
private IIdentityService _identityService;
public LoginViewModel(
ISettingsService settingsService,
IOpenUrlService openUrlService,
IIdentityService identityService)
{
_settingsService = settingsService;
_openUrlService = openUrlService;
_identityService = identityService;
@ -173,7 +176,7 @@ namespace eShopOnContainers.Core.ViewModels
if (isAuthenticated)
{
Settings.AuthAccessToken = GlobalSetting.Instance.AuthToken;
_settingsService.AuthAccessToken = GlobalSetting.Instance.AuthToken;
await NavigationService.NavigateToAsync<MainViewModel>();
await NavigationService.RemoveLastFromBackStackAsync();
@ -202,7 +205,7 @@ namespace eShopOnContainers.Core.ViewModels
private void Logout()
{
var authIdToken = Settings.AuthIdToken;
var authIdToken = _settingsService.AuthIdToken;
var logoutRequest = _identityService.CreateLogoutRequest(authIdToken);
if (!string.IsNullOrEmpty(logoutRequest))
@ -211,13 +214,13 @@ namespace eShopOnContainers.Core.ViewModels
LoginUrl = logoutRequest;
}
if (Settings.UseMocks)
if (_settingsService.UseMocks)
{
Settings.AuthAccessToken = string.Empty;
Settings.AuthIdToken = string.Empty;
_settingsService.AuthAccessToken = string.Empty;
_settingsService.AuthIdToken = string.Empty;
}
Settings.UseFakeLocation = false;
_settingsService.UseFakeLocation = false;
}
private async Task NavigateAsync(string url)
@ -226,8 +229,8 @@ namespace eShopOnContainers.Core.ViewModels
if (unescapedUrl.Equals(GlobalSetting.Instance.LogoutCallback))
{
Settings.AuthAccessToken = string.Empty;
Settings.AuthIdToken = string.Empty;
_settingsService.AuthAccessToken = string.Empty;
_settingsService.AuthIdToken = string.Empty;
IsLogin = false;
LoginUrl = _identityService.CreateAuthorizationRequest();
}
@ -241,8 +244,8 @@ namespace eShopOnContainers.Core.ViewModels
if (!string.IsNullOrWhiteSpace(accessToken))
{
Settings.AuthAccessToken = accessToken;
Settings.AuthIdToken = authResponse.IdentityToken;
_settingsService.AuthAccessToken = accessToken;
_settingsService.AuthIdToken = authResponse.IdentityToken;
await NavigationService.NavigateToAsync<MainViewModel>();
await NavigationService.RemoveLastFromBackStackAsync();
}
@ -281,7 +284,7 @@ namespace eShopOnContainers.Core.ViewModels
public void InvalidateMock()
{
IsMock = Settings.UseMocks;
IsMock = _settingsService.UseMocks;
}
}
}

6
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs
View File

@ -1,8 +1,8 @@
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Navigation;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Models.Navigation;
using Xamarin.Forms;
using System.Threading.Tasks;
using System.Windows.Input;
using Xamarin.Forms;
namespace eShopOnContainers.Core.ViewModels
{

18
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs
View File

@ -1,23 +1,25 @@
using System.Threading.Tasks;
using eShopOnContainers.Core.Models.Orders;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Models.Orders;
using eShopOnContainers.Core.Services.Order;
using System;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels.Base;
using System.Threading.Tasks;
using System.Windows.Input;
using eShopOnContainers.Core.Helpers;
using Xamarin.Forms;
namespace eShopOnContainers.Core.ViewModels
{
public class OrderDetailViewModel : ViewModelBase
{
private readonly ISettingsService _settingsService;
private readonly IOrderService _ordersService;
private Order _order;
private bool _isSubmittedOrder;
private string _orderStatusText;
public OrderDetailViewModel(IOrderService ordersService)
public OrderDetailViewModel(ISettingsService settingsService, IOrderService ordersService)
{
_settingsService = settingsService;
_ordersService = ordersService;
}
@ -63,7 +65,7 @@ namespace eShopOnContainers.Core.ViewModels
var order = navigationData as Order;
// Get order detail info
var authToken = Settings.AuthAccessToken;
var authToken = _settingsService.AuthAccessToken;
Order = await _ordersService.GetOrderAsync(order.OrderNumber, authToken);
IsSubmittedOrder = Order.OrderStatus == OrderStatus.Submitted;
OrderStatusText = Order.OrderStatus.ToString().ToUpper();
@ -74,7 +76,7 @@ namespace eShopOnContainers.Core.ViewModels
private async Task ToggleCancelOrderAsync()
{
var authToken = Settings.AuthAccessToken;
var authToken = _settingsService.AuthAccessToken;
var result = await _ordersService.CancelOrderAsync(_order.OrderNumber, authToken);

11
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs
View File

@ -1,8 +1,8 @@
using eShopOnContainers.Core.Extensions;
using eShopOnContainers.Core.Helpers;
using eShopOnContainers.Core.Models.Orders;
using eShopOnContainers.Core.Models.User;
using eShopOnContainers.Core.Services.Order;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels.Base;
using System.Collections.ObjectModel;
using System.Threading.Tasks;
@ -13,12 +13,13 @@ namespace eShopOnContainers.Core.ViewModels
{
public class ProfileViewModel : ViewModelBase
{
private readonly ISettingsService _settingsService;
private readonly IOrderService _orderService;
private ObservableCollection<Order> _orders;
private IOrderService _orderService;
public ProfileViewModel(IOrderService orderService)
public ProfileViewModel(ISettingsService settingsService, IOrderService orderService)
{
_settingsService = settingsService;
_orderService = orderService;
}
@ -41,7 +42,7 @@ namespace eShopOnContainers.Core.ViewModels
IsBusy = true;
// Get orders
var authToken = Settings.AuthAccessToken;
var authToken = _settingsService.AuthAccessToken;
var orders = await _orderService.GetOrdersAsync(authToken);
Orders = orders.ToObservableCollection();

62
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
View File

@ -1,17 +1,16 @@
using System.Globalization;
using eShopOnContainers.Core.Models.Location;
using eShopOnContainers.Core.Models.User;
using eShopOnContainers.Core.Services.Location;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels.Base;
using Plugin.Geolocator;
using System.Globalization;
using System.Threading.Tasks;
using System.Windows.Input;
using Xamarin.Forms;
namespace eShopOnContainers.Core.ViewModels
{
using System.Windows.Input;
using Xamarin.Forms;
using System.Threading.Tasks;
using Helpers;
using Models.User;
using Base;
using Models.Location;
using Services.Location;
using Plugin.Geolocator;
public class SettingsViewModel : ViewModelBase
{
private string _titleUseAzureServices;
@ -28,18 +27,20 @@ namespace eShopOnContainers.Core.ViewModels
private double _longitude;
private string _gpsWarningMessage;
private readonly ISettingsService _settingsService;
private readonly ILocationService _locationService;
public SettingsViewModel(ILocationService locationService)
public SettingsViewModel(ISettingsService settingsService, ILocationService locationService)
{
_settingsService = settingsService;
_locationService = locationService;
_useAzureServices = !Settings.UseMocks;
_endpoint = Settings.UrlBase;
_latitude = double.Parse(Settings.Latitude, CultureInfo.CurrentCulture);
_longitude = double.Parse(Settings.Longitude, CultureInfo.CurrentCulture);
_useFakeLocation = Settings.UseFakeLocation;
_allowGpsLocation = Settings.AllowGpsLocation;
_useAzureServices = !_settingsService.UseMocks;
_endpoint = _settingsService.UrlBase;
_latitude = double.Parse(_settingsService.Latitude, CultureInfo.CurrentCulture);
_longitude = double.Parse(_settingsService.Longitude, CultureInfo.CurrentCulture);
_useFakeLocation = _settingsService.UseFakeLocation;
_allowGpsLocation = _settingsService.AllowGpsLocation;
_gpsWarningMessage = string.Empty;
}
@ -194,7 +195,7 @@ namespace eShopOnContainers.Core.ViewModels
}
}
public bool UserIsLogged => !string.IsNullOrEmpty(Settings.AuthAccessToken);
public bool UserIsLogged => !string.IsNullOrEmpty(_settingsService.AuthAccessToken);
public ICommand ToggleMockServicesCommand => new Command(async () => await ToggleMockServicesAsync());
@ -227,8 +228,9 @@ namespace eShopOnContainers.Core.ViewModels
await Task.Delay(1000);
if (UseAzureServices)
{
Settings.AuthAccessToken = string.Empty;
Settings.AuthIdToken = string.Empty;
_settingsService.AuthAccessToken = string.Empty;
_settingsService.AuthIdToken = string.Empty;
await NavigationService.NavigateToAsync<LoginViewModel>(new LogoutParameter { Logout = true });
await NavigationService.RemoveBackStackAsync();
}
@ -244,14 +246,14 @@ namespace eShopOnContainers.Core.ViewModels
private async Task ToggleSendLocationAsync()
{
if (!Settings.UseMocks)
if (!_settingsService.UseMocks)
{
var locationRequest = new Location
{
Latitude = _latitude,
Longitude = _longitude
};
var authToken = Settings.AuthAccessToken;
var authToken = _settingsService.AuthAccessToken;
await _locationService.UpdateUserLocation(locationRequest, authToken);
}
@ -310,30 +312,30 @@ namespace eShopOnContainers.Core.ViewModels
private void UpdateUseAzureServices()
{
// Save use mocks services to local storage
Settings.UseMocks = !_useAzureServices;
_settingsService.UseMocks = !_useAzureServices;
}
private void UpdateEndpoint()
{
// Update remote endpoint (save to local storage)
GlobalSetting.Instance.BaseEndpoint = Settings.UrlBase = _endpoint;
GlobalSetting.Instance.BaseEndpoint = _settingsService.UrlBase = _endpoint;
}
private void UpdateFakeLocation()
{
Settings.UseFakeLocation = _useFakeLocation;
_settingsService.UseFakeLocation = _useFakeLocation;
}
private void UpdateLatitude()
{
// Update fake latitude (save to local storage)
Settings.Latitude = _latitude.ToString();
_settingsService.Latitude = _latitude.ToString();
}
private void UpdateLongitude()
{
// Update fake longitude (save to local storage)
Settings.Longitude = _longitude.ToString();
_settingsService.Longitude = _longitude.ToString();
}
private void UpdateAllowGpsLocation()
@ -348,13 +350,13 @@ namespace eShopOnContainers.Core.ViewModels
}
else
{
Settings.AllowGpsLocation = _allowGpsLocation;
_settingsService.AllowGpsLocation = _allowGpsLocation;
GpsWarningMessage = string.Empty;
}
}
else
{
Settings.AllowGpsLocation = _allowGpsLocation;
_settingsService.AllowGpsLocation = _allowGpsLocation;
}
}
}

8
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml.cs
View File

@ -1,8 +1,8 @@
using System;
using SlideOverKit;
using Xamarin.Forms;
using eShopOnContainers.Core.ViewModels;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.ViewModels;
using SlideOverKit;
using System;
using Xamarin.Forms;
namespace eShopOnContainers.Core.Views
{

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
View File

@ -5,7 +5,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xam.Plugins.Settings" Version="3.1.1" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
<PackageReference Include="Acr.UserDialogs" Version="6.5.1" />
<PackageReference Include="SlideOverKit" Version="2.1.5" />
@ -16,7 +15,4 @@
<PackageReference Include="Xamarin.Forms" Version="2.5.0.122203" />
<PackageReference Include="IdentityModel" Version="3.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="TinyIoC\" />
</ItemGroup>
</Project>

14
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs
View File

@ -1,15 +1,15 @@
using Android.App;
using Android.OS;
using Android.Content.PM;
using Android.Views;
using Xamarin.Forms.Platform.Android;
using FFImageLoading.Forms.Droid;
using Acr.UserDialogs;
using Android.App;
using Android.Content;
using Android.Content.PM;
using Android.OS;
using Android.Runtime;
using Android.Views;
using FFImageLoading;
using System;
using FFImageLoading.Forms.Droid;
using Plugin.Permissions;
using System;
using Xamarin.Forms.Platform.Android;
namespace eShopOnContainers.Droid.Activities
{

8
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/CircleEffect.cs
View File

@ -1,8 +1,8 @@
using System;
using Xamarin.Forms;
using eShopOnContainers.Droid.Effects;
using Android.Graphics;
using Android.Views;
using Android.Graphics;
using eShopOnContainers.Droid.Effects;
using System;
using Xamarin.Forms;
[assembly: ExportEffect(typeof(CircleEffect), "CircleEffect")]
namespace eShopOnContainers.Droid.Effects

11
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/EntryLineColorEffect.cs
View File

@ -1,11 +1,10 @@
using Xamarin.Forms;
using eShopOnContainers.Droid.Effects;
using Xamarin.Forms.Platform.Android;
using System;
using Android.Widget;
using eShopOnContainers.Core.Behaviors;
using eShopOnContainers.Droid.Effects;
using System;
using System.ComponentModel;
using System.Diagnostics;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Android;
[assembly: ResolutionGroupName("eShopOnContainers")]
[assembly: ExportEffect(typeof(EntryLineColorEffect), "EntryLineColorEffect")]
@ -52,7 +51,7 @@ namespace eShopOnContainers.Droid.Effects
}
catch (Exception ex)
{
Debug.WriteLine(ex.Message);
Console.WriteLine(ex.Message);
}
}
}

44
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Helpers/Settings.cs
View File

@ -1,44 +0,0 @@
/*
// Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it.
using Plugin.Settings;
using Plugin.Settings.Abstractions;
namespace eShopOnContainers.Droid.Helpers
{
/// <summary>
/// This is the Settings static class that can be used in your Core solution or in any
/// of your client applications. All settings are laid out the same exact way with getters
/// and setters.
/// </summary>
public static class Settings
{
private static ISettings AppSettings
{
get
{
return CrossSettings.Current;
}
}
#region Setting Constants
private const string SettingsKey = "settings_key";
private static readonly string SettingsDefault = string.Empty;
#endregion
public static string GeneralSettings
{
get
{
return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault);
}
set
{
AppSettings.AddOrUpdateValue(SettingsKey, value);
}
}
}
}*/

2
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs
View File

@ -1,8 +1,8 @@
using System;
using Android.App;
using Android.OS;
using Android.Runtime;
using Plugin.CurrentActivity;
using System;
namespace eShopOnContainers.Droid
{

10
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/BadgeView.cs
View File

@ -1,12 +1,12 @@
using System;
using Android.Content;
using Android.Views;
using Android.Widget;
using Android.Graphics;
using Android.Graphics.Drawables;
using Android.Views.Animations;
using Android.Graphics.Drawables.Shapes;
using Android.Util;
using Android.Graphics;
using Android.Views;
using Android.Views.Animations;
using Android.Widget;
using System;
namespace eShopOnContainers.Droid.Renderers
{

20
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs
View File

@ -1,18 +1,18 @@
using Android.Content;
using Android.Graphics;
using Android.Support.Design.Widget;
using Android.Support.V4.View;
using Android.Views;
using Android.Widget;
using eShopOnContainers.Core.Controls;
using eShopOnContainers.Droid.Extensions;
using eShopOnContainers.Droid.Renderers;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Xamarin.Forms.Platform.Android.AppCompat;
using Xamarin.Forms;
using Android.Content;
using Android.Support.Design.Widget;
using Android.Views;
using Android.Widget;
using Xamarin.Forms.Platform.Android;
using eShopOnContainers.Droid.Extensions;
using eShopOnContainers.Core.Controls;
using eShopOnContainers.Droid.Renderers;
using Android.Support.V4.View;
using Android.Graphics;
using Xamarin.Forms.Platform.Android.AppCompat;
[assembly: ExportRenderer(typeof(TabbedPage), typeof(CustomTabbedPageRenderer))]
namespace eShopOnContainers.Droid.Renderers

2
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/SlideDownMenuPageRenderer.cs
View File

@ -1,7 +1,7 @@
using Android.Content;
using SlideOverKit.Droid;
using eShopOnContainers.Core.Views;
using eShopOnContainers.Droid.Renderers;
using SlideOverKit.Droid;
using System;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Android;

149
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/SettingsServiceImplementation.cs Normal file
View File

@ -0,0 +1,149 @@
using Android.App;
using Android.Content;
using Android.Preferences;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Droid.Services;
using System;
[assembly: Xamarin.Forms.Dependency(typeof(SettingsServiceImplementation))]
namespace eShopOnContainers.Droid.Services
{
public class SettingsServiceImplementation : ISettingsServiceImplementation
{
#region Internal Implementation
readonly object _locker = new object();
ISharedPreferences GetSharedPreference()
{
return PreferenceManager.GetDefaultSharedPreferences(Application.Context);
}
bool AddOrUpdateValueInternal<T>(string key, T value)
{
if (Application.Context == null)
return false;
if (value == null)
{
Remove(key);
return true;
}
var type = typeof(T);
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
{
type = Nullable.GetUnderlyingType(type);
}
var typeCode = Type.GetTypeCode(type);
lock (_locker)
{
using (var sharedPrefs = GetSharedPreference())
{
using (var editor = sharedPrefs.Edit())
{
switch (typeCode)
{
case TypeCode.Boolean:
editor.PutBoolean(key, Convert.ToBoolean(value));
break;
case TypeCode.String:
editor.PutString(key, Convert.ToString(value));
break;
default:
throw new ArgumentException($"Value of type {typeCode} is not supported.");
}
editor.Commit();
}
}
}
return true;
}
T GetValueOrDefaultInternal<T>(string key, T defaultValue = default(T))
{
if (Application.Context == null)
return defaultValue;
if (!Contains(key))
return defaultValue;
lock (_locker)
{
using (var sharedPrefs = GetSharedPreference())
{
var type = typeof(T);
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
{
type = Nullable.GetUnderlyingType(type);
}
object value = null;
var typeCode = Type.GetTypeCode(type);
switch (typeCode)
{
case TypeCode.Boolean:
value = sharedPrefs.GetBoolean(key, Convert.ToBoolean(defaultValue));
break;
case TypeCode.String:
value = sharedPrefs.GetString(key, Convert.ToString(defaultValue));
break;
default:
throw new ArgumentException($"Value of type {typeCode} is not supported.");
}
return null != value ? (T)value : defaultValue;
}
}
}
bool Contains(string key)
{
if (Application.Context == null)
return false;
lock (_locker)
{
using (var sharedPrefs = GetSharedPreference())
{
if (sharedPrefs == null)
return false;
return sharedPrefs.Contains(key);
}
}
}
#endregion
#region ISettingsServiceImplementation
public bool AddOrUpdateValue(string key, bool value) => AddOrUpdateValueInternal(key, value);
public bool AddOrUpdateValue(string key, string value) => AddOrUpdateValueInternal(key, value);
public bool GetValueOrDefault(string key, bool defaultValue) => GetValueOrDefaultInternal(key, defaultValue);
public string GetValueOrDefault(string key, string defaultValue) => GetValueOrDefaultInternal(key, defaultValue);
public void Remove(string key)
{
if (Application.Context == null)
return;
lock (_locker)
{
using (var sharedPrefs = GetSharedPreference())
{
using (var editor = sharedPrefs.Edit())
{
editor.Remove(key);
editor.Commit();
}
}
}
}
#endregion
}
}

11
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
View File

@ -166,12 +166,6 @@
<Reference Include="Plugin.Geolocator">
<HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll</HintPath>
</Reference>
<Reference Include="Plugin.Settings.Abstractions">
<HintPath>..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Plugin.Settings">
<HintPath>..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
</Reference>
@ -232,7 +226,7 @@
<Compile Include="Effects\CircleEffect.cs" />
<Compile Include="Effects\BaseContainerEffect.cs" />
<Compile Include="Activities\SplashActivity.cs" />
<Compile Include="Helpers\Settings.cs" />
<Compile Include="Services\SettingsServiceImplementation.cs" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="..\CommonResources\Fonts\Montserrat-Bold.ttf">
@ -386,6 +380,9 @@
<Name>eShopOnContainers.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Services\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Compat.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Compat.targets')" />
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Core.UI.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Core.UI.targets')" />

1
src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config
View File

@ -70,7 +70,6 @@
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid80" />
<package id="Validation" version="2.2.8" targetFramework="monoandroid80" />
<package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="monoandroid80" />
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid80" />

44
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Helpers/Settings.cs
View File

@ -1,44 +0,0 @@
/*
// Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it.
using Plugin.Settings;
using Plugin.Settings.Abstractions;
namespace eShopOnContainers.TestRunner.Droid.Helpers
{
/// <summary>
/// This is the Settings static class that can be used in your Core solution or in any
/// of your client applications. All settings are laid out the same exact way with getters
/// and setters.
/// </summary>
public static class Settings
{
private static ISettings AppSettings
{
get
{
return CrossSettings.Current;
}
}
#region Setting Constants
private const string SettingsKey = "settings_key";
private static readonly string SettingsDefault = string.Empty;
#endregion
public static string GeneralSettings
{
get
{
return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault);
}
set
{
AppSettings.AddOrUpdateValue(SettingsKey, value);
}
}
}
}*/

3
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs
View File

@ -1,9 +1,8 @@
using System;
using Android.App;
using Android.OS;
using Android.Runtime;
using Plugin.CurrentActivity;
using System;
namespace eShopOnContainers.TestRunner.Droid
{

1
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
View File

@ -231,7 +231,6 @@
<Compile Include="MainActivity.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Helpers\Settings.cs" />
<Compile Include="MainApplication.cs" />
</ItemGroup>
<ItemGroup>

1
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config
View File

@ -67,7 +67,6 @@
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid80" />
<package id="Validation" version="2.2.8" targetFramework="monoandroid80" />
<package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="monoandroid80" />
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Support.Compat" version="25.4.0.2" targetFramework="monoandroid80" />

3
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/App.xaml.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Reflection;
using System.Reflection;
using Windows.ApplicationModel.Activation;
using Xunit.Runners.UI;

44
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/Helpers/Settings.cs
View File

@ -1,44 +0,0 @@
/*
// Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it.
using Plugin.Settings;
using Plugin.Settings.Abstractions;
namespace eShopOnContainers.TestRunner.iOS.Helpers
{
/// <summary>
/// This is the Settings static class that can be used in your Core solution or in any
/// of your client applications. All settings are laid out the same exact way with getters
/// and setters.
/// </summary>
public static class Settings
{
private static ISettings AppSettings
{
get
{
return CrossSettings.Current;
}
}
#region Setting Constants
private const string SettingsKey = "settings_key";
private static readonly string SettingsDefault = string.Empty;
#endregion
public static string GeneralSettings
{
get
{
return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault);
}
set
{
AppSettings.AddOrUpdateValue(SettingsKey, value);
}
}
}
}*/

7
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj
View File

@ -105,7 +105,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<InterfaceDefinition Include="Resources\LaunchScreen.xib" />
<None Include="packages.config" />
<Compile Include="Helpers\Settings.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
@ -148,12 +147,6 @@
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Plugin.Settings.Abstractions">
<HintPath>..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Plugin.Settings">
<HintPath>..\..\..\..\packages\Xam.Plugins.Settings.3.1.1\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Entitlements.plist" />

1
src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config
View File

@ -52,7 +52,6 @@
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.5.0.122203" targetFramework="xamarinios10" />
<package id="xunit" version="2.3.1" targetFramework="xamarinios10" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="xamarinios10" />

6
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs
View File

@ -1,7 +1,7 @@
using Xunit;
using Xamarin.Forms;
using System;
using System;
using System.Globalization;
using Xamarin.Forms;
using Xunit;
namespace eShopOnContainers.UnitTests
{

50
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Helpers/PropertyChangeTracker.cs
View File

@ -1,50 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
namespace eShopOnContainers.UnitTests.Helpers
{
public class PropertyChangeTracker
{
List<string> _notifications = new List<string>();
public PropertyChangeTracker(INotifyPropertyChanged changer)
{
changer.PropertyChanged += (sender, e) => _notifications.Add(e.PropertyName + ".Value");
}
//public string[] ChangedProperties
//{
// get { return _notifications.ToArray(); }
//}
public bool WaitForChange(string propertyName, int maxWaitMilliSeconds)
{
var startTime = DateTime.UtcNow;
while (!_notifications.Contains(propertyName))
{
if (startTime.AddMilliseconds(maxWaitMilliSeconds) < DateTime.UtcNow)
return false;
}
return true;
}
public bool WaitForChange(string propertyName, TimeSpan maxWait)
{
var startTime = DateTime.UtcNow;
while (!_notifications.Contains(propertyName))
{
if (startTime + maxWait < DateTime.UtcNow)
return false;
}
return true;
}
public void Reset()
{
_notifications.Clear();
}
}
}

65
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockSettingsService.cs Normal file
View File

@ -0,0 +1,65 @@
using eShopOnContainers.Core.Services.Settings;
using System;
namespace eShopOnContainers.UnitTests.Mocks
{
public class MockSettingsService : ISettingsService
{
string _accessTokenDefault = string.Empty;
string _idTokenDefault = string.Empty;
bool _useMocksDefault = true;
string _urlBaseDefault = "https://13.88.8.119";
bool _useFakeLocationDefault = false;
bool _allowGpsLocationDefault = false;
double _fakeLatitudeDefault = 47.604610d;
double _fakeLongitudeDefault = -122.315752d;
public string AuthAccessToken
{
get { return _accessTokenDefault; }
set { _accessTokenDefault = value; }
}
public string AuthIdToken
{
get { return _idTokenDefault; }
set { _idTokenDefault = value; }
}
public bool UseMocks
{
get { return _useMocksDefault; }
set { _useMocksDefault = value; }
}
public string UrlBase
{
get { return _urlBaseDefault; }
set { _urlBaseDefault = value; }
}
public bool UseFakeLocation
{
get { return _useFakeLocationDefault; }
set { _useFakeLocationDefault = value; }
}
public string Latitude
{
get { return _fakeLatitudeDefault.ToString(); }
set { _fakeLatitudeDefault = Convert.ToDouble(value); }
}
public string Longitude
{
get { return _fakeLongitudeDefault.ToString(); }
set { _fakeLongitudeDefault = Convert.ToDouble(value); }
}
public bool AllowGpsLocation
{
get { return _allowGpsLocationDefault; }
set { _allowGpsLocationDefault = value; }
}
}
}

4
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs
View File

@ -1,5 +1,5 @@
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Validations;
using eShopOnContainers.Core.Validations;
using eShopOnContainers.Core.ViewModels.Base;
namespace eShopOnContainers.UnitTests
{

9
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs
View File

@ -1,11 +1,10 @@
namespace eShopOnContainers.UnitTests.Services
{
using eShopOnContainers.Core;
using eShopOnContainers.Core.Services.Marketing;
using System.Threading.Tasks;
using Core;
using Core.Helpers;
using Core.Services.Marketing;
using Xunit;
namespace eShopOnContainers.UnitTests.Services
{
public class MarketingServiceTests
{
[Fact]

11
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs
View File

@ -1,10 +1,12 @@
using Xunit;
using eShopOnContainers.Core.Models.Catalog;
using eShopOnContainers.Core.Services.Catalog;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Services.Catalog;
using eShopOnContainers.Core.Models.Catalog;
using System.Threading.Tasks;
using eShopOnContainers.UnitTests.Mocks;
using System.Linq;
using System.Threading.Tasks;
using Xunit;
namespace eShopOnContainers.UnitTests
{
@ -13,6 +15,7 @@ namespace eShopOnContainers.UnitTests
public CatalogViewModelTests()
{
ViewModelLocator.UpdateDependencies(true);
ViewModelLocator.RegisterSingleton<ISettingsService, MockSettingsService>();
}
[Fact]

7
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs
View File

@ -1,8 +1,10 @@
using Xunit;
using eShopOnContainers.Core.Models.Navigation;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Models.Navigation;
using eShopOnContainers.UnitTests.Mocks;
using System.Threading.Tasks;
using Xunit;
namespace eShopOnContainers.UnitTests
{
@ -11,6 +13,7 @@ namespace eShopOnContainers.UnitTests
public MainViewModelTests()
{
ViewModelLocator.UpdateDependencies(true);
ViewModelLocator.RegisterSingleton<ISettingsService, MockSettingsService>();
}
[Fact]

28
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs
View File

@ -1,31 +1,36 @@
namespace eShopOnContainers.UnitTests.ViewModels
{
using eShopOnContainers.Core.Services.Marketing;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.UnitTests.Mocks;
using System.Threading.Tasks;
using Xunit;
using Core.ViewModels.Base;
using Core.Services.Marketing;
using Core.ViewModels;
namespace eShopOnContainers.UnitTests.ViewModels
{
public class MarketingViewModelTests
{
public MarketingViewModelTests()
{
ViewModelLocator.UpdateDependencies(true);
ViewModelLocator.RegisterSingleton<ISettingsService, MockSettingsService>();
}
[Fact]
public void GetCampaignsIsNullTest()
{
var settingsService = new MockSettingsService();
var campaignService = new CampaignMockService();
var campaignViewModel = new CampaignViewModel(campaignService);
var campaignViewModel = new CampaignViewModel(settingsService, campaignService);
Assert.Null(campaignViewModel.Campaigns);
}
[Fact]
public async Task GetCampaignsIsNotNullTest()
{
var settingsService = new MockSettingsService();
var campaignService = new CampaignMockService();
var campaignViewModel = new CampaignViewModel(campaignService);
var campaignViewModel = new CampaignViewModel(settingsService, campaignService);
await campaignViewModel.InitializeAsync(null);
@ -35,24 +40,27 @@
[Fact]
public void GetCampaignDetailsCommandIsNotNullTest()
{
var settingsService = new MockSettingsService();
var campaignService = new CampaignMockService();
var campaignViewModel = new CampaignViewModel(campaignService);
var campaignViewModel = new CampaignViewModel(settingsService, campaignService);
Assert.NotNull(campaignViewModel.GetCampaignDetailsCommand);
}
[Fact]
public void GetCampaignDetailsByIdIsNullTest()
{
var settingsService = new MockSettingsService();
var campaignService = new CampaignMockService();
var campaignViewModel = new CampaignDetailsViewModel(campaignService);
var campaignViewModel = new CampaignDetailsViewModel(settingsService, campaignService);
Assert.Null(campaignViewModel.Campaign);
}
[Fact]
public async Task GetCampaignDetailsByIdIsNotNullTest()
{
var settingsService = new MockSettingsService();
var campaignService = new CampaignMockService();
var campaignDetailsViewModel = new CampaignDetailsViewModel(campaignService);
var campaignDetailsViewModel = new CampaignDetailsViewModel(settingsService, campaignService);
await campaignDetailsViewModel.InitializeAsync(1);

16
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs
View File

@ -1,7 +1,5 @@
using Xunit;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.UnitTests.Helpers;
using System.ComponentModel;
using eShopOnContainers.Core.ViewModels.Base;
using Xunit;
namespace eShopOnContainers.UnitTests
{
@ -86,15 +84,12 @@ namespace eShopOnContainers.UnitTests
bool invoked = false;
var mockViewModel = new MockViewModel();
PropertyChangedEventHandler handler = (sender, e) =>
mockViewModel.Forename.PropertyChanged += (sender, e) =>
{
if (e.PropertyName.Equals("Value"))
invoked = true;
};
mockViewModel.Forename.PropertyChanged += handler;
mockViewModel.Forename.Value = "John";
mockViewModel.Forename.PropertyChanged -= handler;
Assert.True(invoked);
}
@ -105,15 +100,12 @@ namespace eShopOnContainers.UnitTests
bool invoked = false;
var mockViewModel = new MockViewModel();
PropertyChangedEventHandler handler = (sender, e) =>
mockViewModel.Surname.PropertyChanged += (sender, e) =>
{
if (e.PropertyName.Equals("Value"))
invoked = true;
};
mockViewModel.Surname.PropertyChanged += handler;
mockViewModel.Surname.Value = "Smith";
mockViewModel.Surname.PropertyChanged -= handler;
Assert.True(invoked);
}

18
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs
View File

@ -1,9 +1,11 @@
using Xunit;
using eShopOnContainers.Core;
using eShopOnContainers.Core;
using eShopOnContainers.Core.Services.Order;
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Core.ViewModels;
using eShopOnContainers.Core.ViewModels.Base;
using eShopOnContainers.Core.Services.Order;
using eShopOnContainers.UnitTests.Mocks;
using System.Threading.Tasks;
using Xunit;
namespace eShopOnContainers.UnitTests
{
@ -12,21 +14,24 @@ namespace eShopOnContainers.UnitTests
public OrderViewModelTests()
{
ViewModelLocator.UpdateDependencies(true);
ViewModelLocator.RegisterSingleton<ISettingsService, MockSettingsService>();
}
[Fact]
public void OrderPropertyIsNullWhenViewModelInstantiatedTest()
{
var settingsService = new MockSettingsService();
var orderService = new OrderMockService();
var orderViewModel = new OrderDetailViewModel(orderService);
var orderViewModel = new OrderDetailViewModel(settingsService, orderService);
Assert.Null(orderViewModel.Order);
}
[Fact]
public async Task OrderPropertyIsNotNullAfterViewModelInitializationTest()
{
var settingsService = new MockSettingsService();
var orderService = new OrderMockService();
var orderViewModel = new OrderDetailViewModel(orderService);
var orderViewModel = new OrderDetailViewModel(settingsService, orderService);
var order = await orderService.GetOrderAsync(1, GlobalSetting.Instance.AuthToken);
await orderViewModel.InitializeAsync(order);
@ -38,8 +43,9 @@ namespace eShopOnContainers.UnitTests
public async Task SettingOrderPropertyShouldRaisePropertyChanged()
{
bool invoked = false;
var settingsService = new MockSettingsService();
var orderService = new OrderMockService();
var orderViewModel = new OrderDetailViewModel(orderService);
var orderViewModel = new OrderDetailViewModel(settingsService, orderService);
orderViewModel.PropertyChanged += (sender, e) =>
{

3
src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
View File

@ -9,9 +9,6 @@
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.console" Version="2.3.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="Helpers\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj" />
</ItemGroup>

14
src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Effects/EntryLineColorEffect.cs
View File

@ -1,14 +1,14 @@
using System;
using eShopOnContainers.Core.Behaviors;
using eShopOnContainers.Windows.Effects;
using System;
using System.ComponentModel;
using System.Diagnostics;
using UI = Windows.UI;
using Xaml = Windows.UI.Xaml;
using Media = Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Controls;
using Xamarin.Forms;
using Xamarin.Forms.Platform.UWP;
using Windows.UI.Xaml.Controls;
using eShopOnContainers.Windows.Effects;
using eShopOnContainers.Core.Behaviors;
using Media = Windows.UI.Xaml.Media;
using UI = Windows.UI;
using Xaml = Windows.UI.Xaml;
[assembly: ResolutionGroupName("eShopOnContainers")]
[assembly: ExportEffect(typeof(EntryLineColorEffect), "EntryLineColorEffect")]

99
src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Services/SettingsServiceImplementation.cs Normal file
View File

@ -0,0 +1,99 @@
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.Windows.Services;
using Windows.Storage;
[assembly: Xamarin.Forms.Dependency(typeof(SettingsServiceImplementation))]
namespace eShopOnContainers.Windows.Services
{
public class SettingsServiceImplementation : ISettingsServiceImplementation
{
#region Internal Implementation
readonly object _locker = new object();
ApplicationDataContainer GetAppSettings()
{
return ApplicationData.Current.LocalSettings;
}
bool AddOrUpdateValueInternal<T>(string key, T value)
{
bool valueChanged = false;
if (value == null)
{
Remove(key);
return true;
}
lock (_locker)
{
var settings = GetAppSettings();
if (settings.Values.ContainsKey(key))
{
if (settings.Values[key] != (object)value)
{
settings.Values[key] = value;
valueChanged = true;
}
}
else
{
settings.Values[key] = value;
valueChanged = true;
}
}
return valueChanged;
}
T GetValueOrDefaultInternal<T>(string key, T defaultValue = default(T))
{
object value;
lock (_locker)
{
var settings = GetAppSettings();
if (settings.Values.ContainsKey(key))
{
var tempValue = settings.Values[key];
if (tempValue != null)
value = (T)tempValue;
else
value = defaultValue;
}
else
{
value = defaultValue;
}
}
return null != value ? (T)value : defaultValue;
}
#endregion
#region ISettingsServiceImplementation
public bool AddOrUpdateValue(string key, bool value) => AddOrUpdateValueInternal(key, value);
public bool AddOrUpdateValue(string key, string value) => AddOrUpdateValueInternal(key, value);
public bool GetValueOrDefault(string key, bool defaultValue) => GetValueOrDefaultInternal(key, defaultValue);
public string GetValueOrDefault(string key, string defaultValue) => GetValueOrDefaultInternal(key, defaultValue);
public void Remove(string key)
{
lock (_locker)
{
var settings = GetAppSettings();
if (settings.Values.ContainsKey(key))
{
settings.Values.Remove(key);
}
}
}
#endregion
}
}

1
src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
View File

@ -121,6 +121,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Renderers\CustomTabbedPageRenderer.cs" />
<Compile Include="Renderers\SlideDownMenuPageRenderer.cs" />
<Compile Include="Services\SettingsServiceImplementation.cs" />
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">

8
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Effects/CircleEffect.cs
View File

@ -1,9 +1,9 @@
using System;
using CoreAnimation;
using CoreGraphics;
using eShopOnContainers.iOS.Effects;
using System;
using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;
using eShopOnContainers.iOS.Effects;
using CoreGraphics;
using CoreAnimation;
[assembly: ExportEffect(typeof(CircleEffect), "CircleEffect")]
namespace eShopOnContainers.iOS.Effects

44
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Helpers/Settings.cs
View File

@ -1,44 +0,0 @@
/*
// Helpers/Settings.cs This file was automatically added when you installed the Settings Plugin. If you are not using a PCL then comment this file back in to use it.
using Plugin.Settings;
using Plugin.Settings.Abstractions;
namespace eShopOnContainers.iOS.Helpers
{
/// <summary>
/// This is the Settings static class that can be used in your Core solution or in any
/// of your client applications. All settings are laid out the same exact way with getters
/// and setters.
/// </summary>
public static class Settings
{
private static ISettings AppSettings
{
get
{
return CrossSettings.Current;
}
}
#region Setting Constants
private const string SettingsKey = "settings_key";
private static readonly string SettingsDefault = string.Empty;
#endregion
public static string GeneralSettings
{
get
{
return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault);
}
set
{
AppSettings.AddOrUpdateValue(SettingsKey, value);
}
}
}
}*/

4
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Renderers/SlideDownMenuPageRenderer.cs
View File

@ -1,8 +1,8 @@
using System;
using CoreGraphics;
using CoreGraphics;
using eShopOnContainers.Core.Views;
using eShopOnContainers.iOS;
using SlideOverKit.iOS;
using System;
using UIKit;
using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;

128
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/SettingsServiceImplementation.cs Normal file
View File

@ -0,0 +1,128 @@
using eShopOnContainers.Core.Services.Settings;
using eShopOnContainers.iOS.Services;
using Foundation;
using System;
[assembly: Xamarin.Forms.Dependency(typeof(SettingsServiceImplementation))]
namespace eShopOnContainers.iOS.Services
{
public class SettingsServiceImplementation : ISettingsServiceImplementation
{
#region Internal Implementation
readonly object _locker = new object();
NSUserDefaults GetUserDefaults() => NSUserDefaults.StandardUserDefaults;
bool AddOrUpdateValueInternal<T>(string key, T value)
{
if (value == null)
{
Remove(key);
return true;
}
var type = typeof(T);
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
{
type = Nullable.GetUnderlyingType(type);
}
var typeCode = Type.GetTypeCode(type);
lock (_locker)
{
var defaults = GetUserDefaults();
switch (typeCode)
{
case TypeCode.Boolean:
defaults.SetBool(Convert.ToBoolean(value), key);
break;
case TypeCode.String:
defaults.SetString(Convert.ToString(value), key);
break;
default:
throw new ArgumentException($"Value of type {typeCode} is unsupported.");
}
try
{
defaults.Synchronize();
}
catch (Exception ex)
{
Console.WriteLine("Unable to save: " + key, " Message: " + ex.Message);
}
}
return true;
}
T GetValueOrDefaultInternal<T>(string key, T defaultValue = default(T))
{
lock (_locker)
{
var defaults = GetUserDefaults();
if (defaults[key] == null)
{
return defaultValue;
}
var type = typeof(T);
if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
{
type = Nullable.GetUnderlyingType(type);
}
object value = null;
var typeCode = Type.GetTypeCode(type);
switch (typeCode)
{
case TypeCode.Boolean:
value = defaults.BoolForKey(key);
break;
case TypeCode.String:
value = defaults.StringForKey(key);
break;
default:
throw new ArgumentException($"Value of type {typeCode} is unsupported.");
}
return null != value ? (T)value : defaultValue;
}
}
#endregion
#region ISettingsServiceImplementation
public bool AddOrUpdateValue(string key, bool value) => AddOrUpdateValueInternal(key, value);
public bool AddOrUpdateValue(string key, string value) => AddOrUpdateValueInternal(key, value);
public bool GetValueOrDefault(string key, bool defaultValue) => GetValueOrDefaultInternal(key, defaultValue);
public string GetValueOrDefault(string key, string defaultValue) => GetValueOrDefaultInternal(key, defaultValue);
public void Remove(string key)
{
lock (_locker)
{
var defaults = GetUserDefaults();
try
{
if (defaults[key] != null)
{
defaults.RemoveObject(key);
defaults.Synchronize();
}
}
catch (Exception ex)
{
Console.WriteLine("Unable to remove: " + key, " Message: " + ex.Message);
}
}
}
#endregion
}
}

5
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
View File

@ -125,7 +125,7 @@
<BundleResource Include="Resources\menu_campaigns%402x.png" />
<BundleResource Include="Resources\menu_campaigns%403x.png" />
<None Include="packages.config" />
<Compile Include="Helpers\Settings.cs" />
<Compile Include="Services\SettingsServiceImplementation.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Icon-60%403x.png" />
@ -417,6 +417,9 @@
<Name>eShopOnContainers.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Services\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets')" />
<Import Project="..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />

1
src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config
View File

@ -66,7 +66,6 @@
<package id="Validation" version="2.2.8" targetFramework="xamarinios10" />
<package id="WebP.Touch" version="1.0.7" targetFramework="xamarinios10" />
<package id="Xam.Plugin.Geolocator" version="3.0.4" targetFramework="xamarinios10" />
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="xamarinios10" />
<package id="Xamarin.FFImageLoading" version="2.3.4" targetFramework="xamarinios10" />
<package id="Xamarin.FFImageLoading.Forms" version="2.3.4" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.5.0.122203" targetFramework="xamarinios10" />