Merge branch 'development'

isax5 · Aug 1, 2020 · 9a9ed87 · 9a9ed87
2 parents 7628018 + c05643a
commit 9a9ed87
Show file tree

Hide file tree

Showing 5 changed files with 5,544 additions and 14 deletions.
diff --git a/src/Hymnal.Core/Extensions/HymnalLanguageExtension.cs b/src/Hymnal.Core/Extensions/HymnalLanguageExtension.cs
@@ -24,7 +24,7 @@ public static string GetInstrumentURL(this HymnalLanguage hymnalLanguage, int hy
         {
             // Number in 3 digits number when it's less than 3 digits. In an other situation
             // the number will not change
-            return hymnalLanguage.Configuration().InstrumentalMusic.Replace("###", hymnNumber.ToString("D3"));
+            return hymnalLanguage.InstrumentalMusic.Replace("###", hymnNumber.ToString("D3"));
         }
 
         /// <summary>
@@ -37,7 +37,7 @@ public static string GetSungURL(this HymnalLanguage hymnalLanguage, int hymnNumb
         {
             // Number in 3 digits number when it's less than 3 digits. In an other situation
             // the number will not change
-            return hymnalLanguage.Configuration().SungMusic.Replace("###", hymnNumber.ToString("D3"));
+            return hymnalLanguage.SungMusic.Replace("###", hymnNumber.ToString("D3"));
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ public static string GetSungURL(this HymnalLanguage hymnalLanguage, int hymnNumb
         /// <returns></returns>
         public static string GetMusicSheetSource(this HymnalLanguage hymnalLanguage, int hymnNymber)
         {
-            return hymnalLanguage.Configuration().HymnsSheetsFileName.Replace("###", hymnNymber.ToString("D3"));
+            return hymnalLanguage.HymnsSheetsFileName.Replace("###", hymnNymber.ToString("D3"));
         }
     }
 }
diff --git a/src/Hymnal.Core/Services/Implementations/HymnsService.cs b/src/Hymnal.Core/Services/Implementations/HymnsService.cs
@@ -47,7 +47,7 @@ public async Task<IEnumerable<Hymn>> GetHymnListAsync(HymnalLanguage language)
             {
                 try
                 {
-                    var file = await filesService.ReadFileAsync(language.Configuration().HymnsFileName);
+                    var file = await filesService.ReadFileAsync(language.HymnsFileName);
                     List<Hymn> hymns = JsonConvert.DeserializeObject<List<Hymn>>(file);
 
                     // Set Id of the language to know allways where it is from
@@ -103,7 +103,7 @@ public async Task<IEnumerable<Thematic>> GetThematicListAsync(HymnalLanguage lan
 
             if (!ThematicDictionary.ContainsKey(language.Id))
             {
-                var file = await filesService.ReadFileAsync(language.Configuration().ThematicHymnsFileName);
+                var file = await filesService.ReadFileAsync(language.ThematicHymnsFileName);
                 List<Thematic> thematicList = JsonConvert.DeserializeObject<List<Thematic>>(file);
 
                 lock (ThematicDictionary)

diff --git a/src/Hymnal.Core/Services/Implementations/PreferencesService.cs b/src/Hymnal.Core/Services/Implementations/PreferencesService.cs
@@ -1,4 +1,5 @@
 using System;
+using Hymnal.Core.Extensions;
 using Hymnal.Core.Models;
 using Newtonsoft.Json;
 using Xamarin.Essentials;
@@ -19,7 +20,7 @@ public HymnalLanguage ConfiguratedHymnalLanguage
             get
             {
                 var text = Preferences.Get(nameof(ConfiguratedHymnalLanguage), string.Empty);
-                return string.IsNullOrWhiteSpace(text) ? null : JsonConvert.DeserializeObject<HymnalLanguage>(text);
+                return string.IsNullOrWhiteSpace(text) ? null : JsonConvert.DeserializeObject<HymnalLanguage>(text).Configuration();
             }
             set
             {

diff --git a/src/Hymnal.Core/ViewModels/Tabs/SettingsViewModel.cs b/src/Hymnal.Core/ViewModels/Tabs/SettingsViewModel.cs
@@ -71,7 +71,7 @@ IDialogService dialogService
         public override async Task Initialize()
         {
             await base.Initialize();
-            HymnalLanguage = preferencesService.ConfiguratedHymnalLanguage.Configuration();
+            HymnalLanguage = preferencesService.ConfiguratedHymnalLanguage;
 
             AppVersionString = AppInfo.VersionString;
             AppBuildString = AppInfo.BuildString;