From 89769133c81773c9bf20cba1d713e45d184e0d3a Mon Sep 17 00:00:00 2001 From: David Britch Date: Wed, 17 Jan 2018 12:35:57 +0000 Subject: [PATCH] Organised using statements. --- .../eShopOnContainers.Core/App.xaml.cs | 12 ++++---- .../Behaviors/LineColorBehavior.cs | 4 +-- .../Controls/ToggleButton.cs | 6 +--- .../Models/Marketing/Campaign.cs | 6 ++-- .../Models/Marketing/CampaignItem.cs | 6 ++-- .../Models/Marketing/CampaignRoot.cs | 6 ++-- .../Models/Orders/Order.cs | 4 +-- .../Services/Location/ILocationService.cs | 11 ++++---- .../Services/Location/LocationService.cs | 13 ++++----- .../Services/Marketing/CampaignMockService.cs | 6 ++-- .../Services/Marketing/CampaignService.cs | 10 +++---- .../Services/Marketing/ICampaignService.cs | 4 +-- .../Services/Navigation/NavigationService.cs | 5 ++-- .../Services/Order/IOrderService.cs | 1 - .../Services/Order/OrderService.cs | 3 +- .../RequestProvider/HttpRequestExceptionEx.cs | 4 --- .../RequestProvider/RequestProvider.cs | 2 +- .../Services/User/UserMockService.cs | 5 ++-- .../Services/User/UserService.cs | 10 ++----- .../ViewModels/Base/ViewModelBase.cs | 3 +- .../ViewModels/Base/ViewModelLocator.cs | 28 +++++++++---------- .../ViewModels/BasketViewModel.cs | 4 +-- .../ViewModels/CampaignDetailsViewModel.cs | 10 +++---- .../ViewModels/CampaignViewModel.cs | 12 ++++---- .../ViewModels/CatalogViewModel.cs | 8 +++--- .../ViewModels/CheckoutViewModel.cs | 20 ++++++------- .../ViewModels/LoginViewModel.cs | 4 +-- .../ViewModels/MainViewModel.cs | 6 ++-- .../ViewModels/OrderDetailViewModel.cs | 9 +++--- .../ViewModels/ProfileViewModel.cs | 2 +- .../ViewModels/SettingsViewModel.cs | 16 +++++------ .../Views/CatalogView.xaml.cs | 8 +++--- .../Activities/MainActivity.cs | 14 +++++----- .../Effects/CircleEffect.cs | 8 +++--- .../Effects/EntryLineColorEffect.cs | 11 ++++---- .../MainApplication.cs | 2 +- .../Renderers/BadgeView.cs | 10 +++---- .../Renderers/CustomTabbedPageRenderer.cs | 20 ++++++------- .../Renderers/SlideDownMenuPageRenderer.cs | 2 +- .../Services/SettingsServiceImplementation.cs | 6 ++-- .../MainApplication.cs | 5 ++-- .../App.xaml.cs | 3 +- .../Behaviors/EventToCommandBehaviorTests.cs | 8 +++--- .../Mocks/MockSettingsService.cs | 4 +-- .../Mocks/MockViewModel.cs | 6 ++-- .../Services/MarketingServiceTests.cs | 4 +-- .../ViewModels/CatalogViewModelTests.cs | 12 ++++---- .../ViewModels/MainViewModelTests.cs | 6 ++-- .../ViewModels/MarketingViewModelTests.cs | 12 ++++---- .../ViewModels/MockViewModelTests.cs | 4 +-- .../ViewModels/OrderViewModelTests.cs | 10 +++---- .../Effects/EntryLineColorEffect.cs | 14 +++++----- .../Effects/CircleEffect.cs | 8 +++--- .../Renderers/SlideDownMenuPageRenderer.cs | 6 ++-- .../Services/SettingsServiceImplementation.cs | 6 ++-- 55 files changed, 203 insertions(+), 226 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs index a1178fbef..0270bb961 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs @@ -1,13 +1,13 @@ -using System.Globalization; -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; -using eShopOnContainers.Core.Services.Settings; [assembly: XamlCompilation(XamlCompilationOptions.Compile)] namespace eShopOnContainers diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/LineColorBehavior.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/LineColorBehavior.cs index 6ec5defaa..1a4ee4a72 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/LineColorBehavior.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/LineColorBehavior.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/ToggleButton.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/ToggleButton.cs index 3ef454bf4..735a60fa9 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/ToggleButton.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/ToggleButton.cs @@ -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; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/Campaign.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/Campaign.cs index 5e04eae33..29c53264b 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/Campaign.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/Campaign.cs @@ -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; } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignItem.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignItem.cs index 70c5b24d1..c60c97fb2 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignItem.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignItem.cs @@ -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; } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignRoot.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignRoot.cs index a4632ec64..70573dccc 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignRoot.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Marketing/CampaignRoot.cs @@ -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; } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/Order.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/Order.cs index c9adfff14..0232e70ad 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/Order.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/Order.cs @@ -1,6 +1,6 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; -using Newtonsoft.Json; namespace eShopOnContainers.Core.Models.Orders { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/ILocationService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/ILocationService.cs index 8c4f6c2a6..31e990122 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/ILocationService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/ILocationService.cs @@ -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); } } \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs index ddb0606c0..deaa60936 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/LocationService.cs @@ -1,10 +1,9 @@ -namespace eShopOnContainers.Core.Services.Location -{ - using System; - using System.Threading.Tasks; - using Models.Location; - using RequestProvider; +using System; +using System.Threading.Tasks; +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); diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs index edfde78fa..e24405b53 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs index 7c3ab859e..cb74f11b0 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs @@ -1,10 +1,10 @@ -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.Services.FixUri; namespace eShopOnContainers.Core.Services.Marketing { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs index d89ac0616..ec1b821ef 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/ICampaignService.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs index d8308428a..3481cccf5 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs @@ -1,13 +1,12 @@ -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; using System.Threading.Tasks; using Xamarin.Forms; -using eShopOnContainers.Core.Services.Settings; namespace eShopOnContainers.Services { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs index 3503f7c2b..eb975180c 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs @@ -2,7 +2,6 @@ using System.Collections.ObjectModel; using System.Threading.Tasks; - namespace eShopOnContainers.Core.Services.Order { public interface IOrderService diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs index fc6a03a7e..f242971fb 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/HttpRequestExceptionEx.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/HttpRequestExceptionEx.cs index e88e74cc6..4ab0d27e6 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/HttpRequestExceptionEx.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/HttpRequestExceptionEx.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs index 29afc24fd..f7d914beb 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/RequestProvider/RequestProvider.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs index 69837c475..5b32bc296 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserMockService.cs @@ -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 GetUserInfoAsync(string authToken) { await Task.Delay(500); - return MockUserInfo; } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs index d2e9728cc..e52d24489 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs @@ -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 GetUserInfoAsync(string authToken) { UriBuilder builder = new UriBuilder(GlobalSetting.Instance.UserInfoEndpoint); - string uri = builder.ToString(); - - var userInfo = - await _requestProvider.GetAsync(uri, authToken); - + var userInfo = await _requestProvider.GetAsync(uri, authToken); return userInfo; } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs index 3d2381ab1..acb5e6636 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs @@ -1,7 +1,6 @@ -using eShopOnContainers.Core.Helpers; +using eShopOnContainers.Core.Services.Settings; using eShopOnContainers.Services; using System.Threading.Tasks; -using eShopOnContainers.Core.Services.Settings; namespace eShopOnContainers.Core.ViewModels.Base { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs index a27d27796..22b8bc99d 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs @@ -1,21 +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 eShopOnContainers.Core.Services.Location; -using eShopOnContainers.Core.Services.Marketing; -using eShopOnContainers.Core.Services.Dependency; -using eShopOnContainers.Core.Services.Settings; -using eShopOnContainers.Core.Services.FixUri; -using Xamarin.Forms; using TinyIoC; +using Xamarin.Forms; namespace eShopOnContainers.Core.ViewModels.Base { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs index 3d23adb6f..7350ee1b6 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs @@ -1,7 +1,7 @@ -using eShopOnContainers.Core.Services.Settings; -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; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs index d24e2f6cf..2e0275f8b 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignDetailsViewModel.cs @@ -1,10 +1,10 @@ -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.Services.Settings; -using eShopOnContainers.Core.Models.Marketing; -using eShopOnContainers.Core.Services.Marketing; namespace eShopOnContainers.Core.ViewModels { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs index ee79136f5..53f7cb847 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CampaignViewModel.cs @@ -1,11 +1,11 @@ -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.Services.Settings; namespace eShopOnContainers.Core.ViewModels { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs index 0a4f52139..1554f7fb0 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs index f9ed8c05d..4eb9010a3 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs @@ -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.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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs index 5f6630159..02711fb39 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs @@ -1,7 +1,7 @@ -using eShopOnContainers.Core.Services.Settings; -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; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs index 592d6b831..77ecf16c9 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs index 416183935..07ad7fffd 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs @@ -1,10 +1,9 @@ -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 System.Windows.Input; using eShopOnContainers.Core.Services.Settings; +using eShopOnContainers.Core.ViewModels.Base; +using System.Threading.Tasks; +using System.Windows.Input; using Xamarin.Forms; namespace eShopOnContainers.Core.ViewModels diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs index 327bdb8d2..b54814a15 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs @@ -2,12 +2,12 @@ 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; using System.Windows.Input; using Xamarin.Forms; -using eShopOnContainers.Core.Services.Settings; namespace eShopOnContainers.Core.ViewModels { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs index 060d2ce69..1e478b85c 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs @@ -1,13 +1,13 @@ -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; -using System.Threading.Tasks; -using eShopOnContainers.Core.Models.User; -using eShopOnContainers.Core.ViewModels.Base; -using eShopOnContainers.Core.Models.Location; -using eShopOnContainers.Core.Services.Location; -using Plugin.Geolocator; -using eShopOnContainers.Core.Services.Settings; namespace eShopOnContainers.Core.ViewModels { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml.cs index 792b93b5c..32c6b82c1 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs index d1dacc488..d72898f40 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/CircleEffect.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/CircleEffect.cs index c1ed78cb3..a8bbd3f18 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/CircleEffect.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/CircleEffect.cs @@ -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 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/EntryLineColorEffect.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/EntryLineColorEffect.cs index 0d539bcbc..36a31951b 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/EntryLineColorEffect.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Effects/EntryLineColorEffect.cs @@ -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); } } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs index ee3f128e8..74e5a3883 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/MainApplication.cs @@ -1,8 +1,8 @@ -using System; using Android.App; using Android.OS; using Android.Runtime; using Plugin.CurrentActivity; +using System; namespace eShopOnContainers.Droid { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/BadgeView.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/BadgeView.cs index 86e739693..e824c3f36 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/BadgeView.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/BadgeView.cs @@ -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 { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs index 525cfcedc..2191c2247 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/CustomTabbedPageRenderer.cs @@ -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 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/SlideDownMenuPageRenderer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/SlideDownMenuPageRenderer.cs index 714a86c9b..1a95a68f6 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/SlideDownMenuPageRenderer.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/SlideDownMenuPageRenderer.cs @@ -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; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/SettingsServiceImplementation.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/SettingsServiceImplementation.cs index 020237d93..c5323c7b9 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/SettingsServiceImplementation.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/SettingsServiceImplementation.cs @@ -1,9 +1,9 @@ -using System; -using eShopOnContainers.Core.Services.Settings; -using Android.App; +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 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs index 770fedc82..f950dba1f 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/MainApplication.cs @@ -1,13 +1,12 @@ -using System; - using Android.App; using Android.OS; using Android.Runtime; using Plugin.CurrentActivity; +using System; namespace eShopOnContainers.TestRunner.Droid { - //You can specify additional application information in this attribute + //You can specify additional application information in this attribute [Application] public class MainApplication : Application, Application.IActivityLifecycleCallbacks { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/App.xaml.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/App.xaml.cs index 632e51fa8..0d3fc41d7 100755 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/App.xaml.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/App.xaml.cs @@ -1,5 +1,4 @@ -using System; -using System.Reflection; +using System.Reflection; using Windows.ApplicationModel.Activation; using Xunit.Runners.UI; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs index ce6ce8f96..85ef11b7a 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Behaviors/EventToCommandBehaviorTests.cs @@ -1,11 +1,11 @@ -using Xunit; -using Xamarin.Forms; -using System; +using System; using System.Globalization; +using Xamarin.Forms; +using Xunit; namespace eShopOnContainers.UnitTests { - public class EventToCommandBehaviorTests + public class EventToCommandBehaviorTests { [Fact] public void InvalidEventNameShouldThrowArgumentExceptionText() diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockSettingsService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockSettingsService.cs index c47c4e262..23e1cedc5 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockSettingsService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockSettingsService.cs @@ -1,5 +1,5 @@ -using System; -using eShopOnContainers.Core.Services.Settings; +using eShopOnContainers.Core.Services.Settings; +using System; namespace eShopOnContainers.UnitTests.Mocks { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs index 64acab458..784be1952 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Mocks/MockViewModel.cs @@ -1,9 +1,9 @@ -using eShopOnContainers.Core.ViewModels.Base; -using eShopOnContainers.Core.Validations; +using eShopOnContainers.Core.Validations; +using eShopOnContainers.Core.ViewModels.Base; namespace eShopOnContainers.UnitTests { - public class MockViewModel : ViewModelBase + public class MockViewModel : ViewModelBase { private ValidatableObject _forename; private ValidatableObject _surname; diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs index 32091eaa4..3de1e3706 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/Services/MarketingServiceTests.cs @@ -1,6 +1,6 @@ -using System.Threading.Tasks; -using eShopOnContainers.Core; +using eShopOnContainers.Core; using eShopOnContainers.Core.Services.Marketing; +using System.Threading.Tasks; using Xunit; namespace eShopOnContainers.UnitTests.Services diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs index 2da535d10..dc9c421eb 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/CatalogViewModelTests.cs @@ -1,12 +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 System.Linq; -using eShopOnContainers.Core.Services.Settings; using eShopOnContainers.UnitTests.Mocks; +using System.Linq; +using System.Threading.Tasks; +using Xunit; namespace eShopOnContainers.UnitTests { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs index 94e0dabfc..bdf9430db 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MainViewModelTests.cs @@ -1,10 +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.Core.Services.Settings; using eShopOnContainers.UnitTests.Mocks; using System.Threading.Tasks; +using Xunit; namespace eShopOnContainers.UnitTests { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs index c05520535..884aa2a2d 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MarketingViewModelTests.cs @@ -1,10 +1,10 @@ -using System.Threading.Tasks; -using Xunit; -using eShopOnContainers.Core.ViewModels.Base; -using eShopOnContainers.Core.Services.Marketing; -using eShopOnContainers.Core.ViewModels; -using eShopOnContainers.UnitTests.Mocks; +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; namespace eShopOnContainers.UnitTests.ViewModels { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs index 84a11ed53..71ff88bed 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/MockViewModelTests.cs @@ -1,5 +1,5 @@ -using Xunit; -using eShopOnContainers.Core.ViewModels.Base; +using eShopOnContainers.Core.ViewModels.Base; +using Xunit; namespace eShopOnContainers.UnitTests { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs index ddd86720b..832f0bc5f 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/ViewModels/OrderViewModelTests.cs @@ -1,11 +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 System.Threading.Tasks; using eShopOnContainers.UnitTests.Mocks; -using eShopOnContainers.Core.Services.Settings; +using System.Threading.Tasks; +using Xunit; namespace eShopOnContainers.UnitTests { diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Effects/EntryLineColorEffect.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Effects/EntryLineColorEffect.cs index 5dfbce19e..c7979b12e 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Effects/EntryLineColorEffect.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Effects/EntryLineColorEffect.cs @@ -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")] diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Effects/CircleEffect.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Effects/CircleEffect.cs index 307227e1c..293c9fd41 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Effects/CircleEffect.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Effects/CircleEffect.cs @@ -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 diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Renderers/SlideDownMenuPageRenderer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Renderers/SlideDownMenuPageRenderer.cs index 61539fa66..4a08777e9 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Renderers/SlideDownMenuPageRenderer.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Renderers/SlideDownMenuPageRenderer.cs @@ -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; @@ -10,7 +10,7 @@ using Xamarin.Forms.Platform.iOS; [assembly: ExportRenderer(typeof(CatalogView), typeof(SlideDownMenuPageRenderer))] namespace eShopOnContainers.iOS { - public class SlideDownMenuPageRenderer : PageRenderer, ISlideOverKitPageRendereriOS + public class SlideDownMenuPageRenderer : PageRenderer, ISlideOverKitPageRendereriOS { public Action ViewDidAppearEvent { get; set; } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/SettingsServiceImplementation.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/SettingsServiceImplementation.cs index 88c3ad824..b04b49b01 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/SettingsServiceImplementation.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/SettingsServiceImplementation.cs @@ -1,7 +1,7 @@ -using System; -using Foundation; -using eShopOnContainers.Core.Services.Settings; +using eShopOnContainers.Core.Services.Settings; using eShopOnContainers.iOS.Services; +using Foundation; +using System; [assembly: Xamarin.Forms.Dependency(typeof(SettingsServiceImplementation))] namespace eShopOnContainers.iOS.Services