Using statements sorted.

Author: davidbritch

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Location/ILocationServiceImplementation.cs

@@ -1,7 +1,7 @@
-using System;
+using eShopOnContainers.Core.Models.Location;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
-using eShopOnContainers.Core.Models.Location;
 
 namespace eShopOnContainers.Core.Services.Location
 {

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/GeolocationSingleListener.cs

@@ -1,12 +1,12 @@
-using System;
-using System.Threading.Tasks;
-using Android.Locations;
+using Android.Locations;
 using Android.OS;
-using System.Threading;
-using System.Collections.Generic;
 using Android.Runtime;
 using eShopOnContainers.Core.Models.Location;
 using eShopOnContainers.Droid.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace eShopOnContainers.Droid.Services
 {

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/LocationServiceImplementation.cs

@@ -1,17 +1,17 @@
 using Android.App;
 using Android.Content;
-using eShopOnContainers.Droid.Services;
-using System;
-using eShopOnContainers.Core.Services.Location;
+using Android.Locations;
+using Android.OS;
 using eShopOnContainers.Core.Models.Location;
 using eShopOnContainers.Core.Models.Permissions;
+using eShopOnContainers.Core.Services.Location;
+using eShopOnContainers.Droid.Activities;
+using eShopOnContainers.Droid.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Android.Locations;
-using System.Linq;
-using System.Collections.Generic;
-using Android.OS;
-using eShopOnContainers.Droid.Activities;
 
 [assembly: Xamarin.Forms.Dependency(typeof(LocationServiceImplementation))]
 namespace eShopOnContainers.Droid.Services

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/PermissionsService.cs

@@ -1,14 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using eShopOnContainers.Core.Models.Permissions;
-using eShopOnContainers.Core.Services.Permissions;
-using System.Linq;
-using Android;
+using Android;
 using Android.App;
 using Android.Support.V4.App;
 using Android.Support.V4.Content;
+using eShopOnContainers.Core.Models.Permissions;
+using eShopOnContainers.Core.Services.Permissions;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace eShopOnContainers.Droid.Services
 {

src/Mobile/eShopOnContainers/eShopOnContainers.Windows/Services/LocationServiceImplementation.cs

@@ -21,24 +21,6 @@ public LocationServiceImplementation()
 
         #region Internal Implementation
 
-        Geolocator GetGeolocator()
-        {
-            var loc = _locator;
-            if (loc == null)
-            {
-                _locator = new Geolocator();
-                _locator.StatusChanged += OnLocatorStatusChanged;
-                loc = _locator;
-            }
-            return loc;
-        }
-
-        PositionStatus GetGeolocatorStatus()
-        {
-            var loc = GetGeolocator();
-            return loc.LocationStatus;
-        }
-
         static Position GetPosition(Geoposition position)
         {
             var pos = new Position
@@ -60,24 +42,6 @@ static Position GetPosition(Geoposition position)
             return pos;
         }
 
-        async void OnLocatorStatusChanged(Geolocator sender, StatusChangedEventArgs e)
-        {
-            GeolocationError error;
-
-            switch (e.Status)
-            {
-                case PositionStatus.Disabled:
-                    error = GeolocationError.Unauthorized;
-                    break;
-                case PositionStatus.NoData:
-                    error = GeolocationError.PositionUnavailable;
-                    break;
-                default:
-                    return;
-            }
-            _locator = null;
-        }
-
         #endregion
 
         #region ILocationServiceImplementation
@@ -88,22 +52,19 @@ public double DesiredAccuracy
             set
             {
                 _desiredAccuracy = value;
-                GetGeolocator().DesiredAccuracy = (value < 100) ? PositionAccuracy.High : PositionAccuracy.Default;
+                _locator.DesiredAccuracy = (value < 100) ? PositionAccuracy.High : PositionAccuracy.Default;
             }
         }
 
-        public event EventHandler<PositionErrorEventArgs> PositionError;
-        public event EventHandler<PositionEventArgs> PositionChanged;
-
         public bool IsGeolocationAvailable
         {
             get
             {
-                var status = GetGeolocatorStatus();
+                var status = _locator.LocationStatus;
                 while (status == PositionStatus.Initializing)
                 {
                     Task.Delay(10).Wait();
-                    status = GetGeolocatorStatus();
+                    status = _locator.LocationStatus;
                 }
                 return status != PositionStatus.NotAvailable;
             }
@@ -113,17 +74,17 @@ public bool IsGeolocationEnabled
         {
             get
             {
-                var status = GetGeolocatorStatus();
+                var status = _locator.LocationStatus;
                 while (status == PositionStatus.Initializing)
                 {
                     Task.Delay(10).Wait();
-                    status = GetGeolocatorStatus();
+                    status = _locator.LocationStatus;
                 }
                 return status != PositionStatus.Disabled && status != PositionStatus.NotAvailable;
             }
         }
 
-        public Task<Position> GetPositionAsync(TimeSpan? timeout = null, CancellationToken? cancelToken = null, bool includeHeading = false)
+        public Task<Position> GetPositionAsync(TimeSpan? timeout = null, CancellationToken? cancelToken = null)
         {
             var timeoutMilliseconds = timeout.HasValue ? (int)timeout.Value.TotalMilliseconds : eShopOnContainers.Windows.Helpers.Timeout.Infinite;
             if (timeoutMilliseconds < 0 && timeoutMilliseconds != eShopOnContainers.Windows.Helpers.Timeout.Infinite)
@@ -132,15 +93,14 @@ public Task<Position> GetPositionAsync(TimeSpan? timeout = null, CancellationTok
             if (!cancelToken.HasValue)
                 cancelToken = CancellationToken.None;
 
-            var pos = GetGeolocator().GetGeopositionAsync(TimeSpan.FromTicks(0), TimeSpan.FromDays(365));
+            var pos = _locator.GetGeopositionAsync(TimeSpan.FromTicks(0), TimeSpan.FromDays(365));
             cancelToken.Value.Register(o => ((IAsyncOperation<Geoposition>)o).Cancel(), pos);
             var timer = new eShopOnContainers.Windows.Helpers.Timeout(timeoutMilliseconds, pos.Cancel);
             var tcs = new TaskCompletionSource<Position>();
 
             pos.Completed = (op, s) =>
             {
                 timer.Cancel();
-
                 switch (s)
                 {
                     case AsyncStatus.Canceled:

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/GeolocationSingleUpdateDelegate.cs

@@ -1,10 +1,9 @@
-using System;
-using CoreLocation;
+using CoreLocation;
+using eShopOnContainers.Core.Models.Location;
 using Foundation;
-using System.Threading.Tasks;
+using System;
 using System.Threading;
-using System.Linq;
-using eShopOnContainers.Core.Models.Location;
+using System.Threading.Tasks;
 
 namespace eShopOnContainers.iOS.Services
 {

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/LocationServiceImplementation.cs

@@ -1,14 +1,14 @@
-using eShopOnContainers.iOS.Services;
-using eShopOnContainers.Core.Services.Location;
-using CoreLocation;
+using CoreLocation;
 using eShopOnContainers.Core.Models.Location;
+using eShopOnContainers.Core.Models.Permissions;
+using eShopOnContainers.Core.Services.Location;
+using eShopOnContainers.Core.Services.Permissions;
+using eShopOnContainers.iOS.Services;
 using Foundation;
 using System;
-using System.Threading.Tasks;
 using System.Threading;
+using System.Threading.Tasks;
 using UIKit;
-using eShopOnContainers.Core.Models.Permissions;
-using eShopOnContainers.Core.Services.Permissions;
 
 [assembly: Xamarin.Forms.Dependency(typeof(LocationServiceImplementation))]
 namespace eShopOnContainers.iOS.Services

src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Services/PermissionsService.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using CoreLocation;
 using eShopOnContainers.Core.Models.Permissions;
 using eShopOnContainers.Core.Services.Permissions;
-using CoreLocation;
-using UIKit;
 using Foundation;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UIKit;
 
 namespace eShopOnContainers.iOS.Services
 {