SettingsService now uses Application.Current.Properties dictionary.

Platform specific settings code removed.

Author: David Britch

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/ObservableExtension.cs

@@ -15,7 +15,6 @@ public static ObservableCollection<T> ToObservableCollection<T>(this IEnumerable
             }
 
             return collection;
-
         }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Settings/ISettingsService.cs

@@ -1,4 +1,6 @@
-namespace eShopOnContainers.Core.Services.Settings
+using System.Threading.Tasks;
+
+namespace eShopOnContainers.Core.Services.Settings
 {
     public interface ISettingsService
     {
@@ -10,5 +12,10 @@ public interface ISettingsService
         string Latitude { get; set; }
         string Longitude { get; set; }
         bool AllowGpsLocation { get; set; }
+
+        bool GetValueOrDefault(string key, bool defaultValue);
+        string GetValueOrDefault(string key, string defaultValue);
+        Task AddOrUpdateValue(string key, bool value);
+        Task AddOrUpdateValue(string key, string value);
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Settings/ISettingsServiceImplementation.cs

@@ -1,21 +1,11 @@
-using eShopOnContainers.Core.Services.Dependency;
+using System;
+using System.Threading.Tasks;
+using Xamarin.Forms;
 
 namespace eShopOnContainers.Core.Services.Settings
 {
     public class SettingsService : ISettingsService
     {
-        private readonly ISettingsServiceImplementation _settingsService;
-
-        ISettingsServiceImplementation AppSettings
-        {
-            get { return _settingsService; }
-        }
-
-        public SettingsService(IDependencyService dependencyService)
-        {
-            _settingsService = dependencyService.Get<ISettingsServiceImplementation>();
-        }
-
         #region Setting Constants
 
         private const string AccessToken = "access_token";
@@ -37,52 +27,113 @@ public SettingsService(IDependencyService dependencyService)
 
         #endregion
 
+        #region Settings Properties
+
         public string AuthAccessToken
         {
-            get => AppSettings.GetValueOrDefault(AccessToken, AccessTokenDefault);
-            set => AppSettings.AddOrUpdateValue(AccessToken, value);
+            get => GetValueOrDefault(AccessToken, AccessTokenDefault);
+            set => AddOrUpdateValue(AccessToken, value);
         }
 
         public string AuthIdToken
         {
-            get => AppSettings.GetValueOrDefault(IdToken, IdTokenDefault);
-            set => AppSettings.AddOrUpdateValue(IdToken, value);
+            get => GetValueOrDefault(IdToken, IdTokenDefault);
+            set => AddOrUpdateValue(IdToken, value);
         }
 
         public bool UseMocks
         {
-            get => AppSettings.GetValueOrDefault(IdUseMocks, UseMocksDefault);
-            set => AppSettings.AddOrUpdateValue(IdUseMocks, value);
+            get => GetValueOrDefault(IdUseMocks, UseMocksDefault);
+            set => AddOrUpdateValue(IdUseMocks, value);
         }
 
         public string UrlBase
         {
-            get => AppSettings.GetValueOrDefault(IdUrlBase, UrlBaseDefault);
-            set => AppSettings.AddOrUpdateValue(IdUrlBase, value);
+            get => GetValueOrDefault(IdUrlBase, UrlBaseDefault);
+            set => AddOrUpdateValue(IdUrlBase, value);
         }
 
         public bool UseFakeLocation
         {
-            get => AppSettings.GetValueOrDefault(IdUseFakeLocation, UseFakeLocationDefault);
-            set => AppSettings.AddOrUpdateValue(IdUseFakeLocation, value);
+            get => GetValueOrDefault(IdUseFakeLocation, UseFakeLocationDefault);
+            set => AddOrUpdateValue(IdUseFakeLocation, value);
         }
 
         public string Latitude
         {
-            get => AppSettings.GetValueOrDefault(IdLatitude, FakeLatitudeDefault.ToString());
-            set => AppSettings.AddOrUpdateValue(IdLatitude, value);
+            get => GetValueOrDefault(IdLatitude, FakeLatitudeDefault.ToString());
+            set => AddOrUpdateValue(IdLatitude, value);
         }
 
         public string Longitude
         {
-            get => AppSettings.GetValueOrDefault(IdLongitude, FakeLongitudeDefault.ToString());
-            set => AppSettings.AddOrUpdateValue(IdLongitude, value);
+            get => GetValueOrDefault(IdLongitude, FakeLongitudeDefault.ToString());
+            set => AddOrUpdateValue(IdLongitude, value);
         }
 
         public bool AllowGpsLocation
         {
-            get => AppSettings.GetValueOrDefault(IdAllowGpsLocation, AllowGpsLocationDefault);
-            set => AppSettings.AddOrUpdateValue(IdAllowGpsLocation, value);
+            get => GetValueOrDefault(IdAllowGpsLocation, AllowGpsLocationDefault);
+            set => AddOrUpdateValue(IdAllowGpsLocation, value);
         }
+
+        #endregion
+
+        #region Public Methods
+
+        public Task AddOrUpdateValue(string key, bool value) => AddOrUpdateValueInternal(key, value);
+        public Task 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);
+
+        #endregion
+
+        #region Internal Implementation
+
+        async Task AddOrUpdateValueInternal<T>(string key, T value)
+        {
+            if (value == null)
+            {
+                await Remove(key);
+            }
+
+            Application.Current.Properties[key] = value;
+            try
+            {
+                await Application.Current.SavePropertiesAsync();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Unable to save: " + key, " Message: " + ex.Message);
+            }
+        }
+
+        T GetValueOrDefaultInternal<T>(string key, T defaultValue = default(T))
+        {
+            object value = null;
+            if (Application.Current.Properties.ContainsKey(key))
+            {
+                value = Application.Current.Properties[key];
+            }
+            return null != value ? (T)value : defaultValue;
+        }
+
+        async Task Remove(string key)
+        {
+            try
+            {
+                if (Application.Current.Properties[key] != null)
+                {
+                    Application.Current.Properties.Remove(key);
+                    await Application.Current.SavePropertiesAsync();
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Unable to remove: " + key, " Message: " + ex.Message);
+            }
+        }
+
+        #endregion
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Settings/SettingsService.cs

@@ -32,7 +32,7 @@ internal static DateTimeOffset GetTimestamp(this Android.Locations.Location loca
             {
                 return new DateTimeOffset(Epoch.AddMilliseconds(location.Time));
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return new DateTimeOffset(Epoch);
             }

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Extensions/LocationExtensions.cs

@@ -19,7 +19,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
     <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
     <MandroidI18n />
@@ -211,7 +211,6 @@
     <Compile Include="Effects\CircleEffect.cs" />
     <Compile Include="Effects\BaseContainerEffect.cs" />
     <Compile Include="Activities\SplashActivity.cs" />
-    <Compile Include="Services\SettingsServiceImplementation.cs" />
     <Compile Include="Services\PermissionsService.cs" />
     <Compile Include="Services\LocationServiceImplementation.cs" />
     <Compile Include="Services\GeolocationSingleListener.cs" />