Code restructuring and cleanup #12 #11 #13 #7

Drutol · Dec 5, 2019 · 1802b85 · 1802b85
1 parent d068cdf
commit 1802b85
Show file tree

Hide file tree

Showing 31 changed files with 993 additions and 981 deletions.
diff --git a/CrossHMI/CrossHMI.Android/Activities/MainActivity.cs b/CrossHMI/CrossHMI.Android/Activities/MainActivity.cs
@@ -16,6 +16,7 @@
 using AoLibs.Navigation.Core.Interfaces;
 using AoLibs.Navigation.Core.PageProviders;
 using Autofac;
+using CrossHMI.Android.Adapters;
 using CrossHMI.Android.Fragment;
 using CrossHMI.Interfaces.Adapters;
 using CrossHMI.Models.Enums;
@@ -36,7 +37,7 @@ public class MainActivity : AppCompatActivity, IOnActivityResultProvider, IOnNew
 
         public MainActivity()
         {
-            _logger = ResourceLocator.GetLogger<MainActivity>();
+            _logger = new LogAdapter<MainActivity>();
             Instance = this;
         }
 

diff --git a/CrossHMI/CrossHMI.Android/Adapters/ConfigurationResourcesProvider.cs b/CrossHMI/CrossHMI.Android/Adapters/ConfigurationResourcesProvider.cs
@@ -17,10 +17,10 @@ public ConfigurationResourcesProvider(IContextProvider contextProvider,
             _logger = logger;
         }
 
-        public Stream ObtainLibraryConfigurationXML()
+        public Stream ObtainLibraryConfiguration()
         {
             _logger.LogDebug("Reading configuration data from native asset data file on Android.");
-            return _contextProvider.CurrentContext.Assets.Open("LibraryConfiguration.xml", Access.Random);
+            return _contextProvider.CurrentContext.Assets.Open("LibraryConfiguration.json", Access.Random);
         }
     }
 }