mirror-github-minimalbible/MinimalBible
1
0
Fork 0
mirror of https://github.com/MinimalBible/MinimalBible synced 2025-07-05 07:44:43 -04:00
Code Issues Releases Wiki Activity

Refactor the Core of LocaleManager, test it

Browse Source
This commit is contained in:
Bradlee Speice
2014-11-10 23:45:21 -05:00
parent 7bc161214d
commit 6a45d872f8
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/kotlin/org/bspeice/minimalbible/activity/downloader/manager/LocaleManager.kt
View File

@ -12,12 +12,18 @@ class LocaleManager(val rM: RefreshManager) {
// Language doesn't have hashCode(), so we actually group by its String
.groupBy { FixedLanguage(it.getLanguage()) }
// I would suppress the warning here if I could figure out how...
val modulesByLanguage = languageModuleMap
.map { GroupedObservable.from(it.getKey(): Language, it) }
// Cast back to the original Language implementation
val availableLanguages: Observable<Language> = languageModuleMap.map { it.getKey() }
val sortedLanguagesList =
Core.sortedLanguagesList(availableLanguages, currentLanguage).toBlocking().first()
object Core {
fun sortedLanguagesList(availableLanguages: Observable<Language>,
currentLanguage: Language) =
availableLanguages.toSortedList {(left, right) ->
// Prioritize our current language first
if (left.getName() == currentLanguage.getName())
@ -25,8 +31,9 @@ class LocaleManager(val rM: RefreshManager) {
else if (right.getName() == currentLanguage.getName())
1
else
left.getName().compareTo(right.getName())
}.toBlocking().first()
left.getName() compareTo right.getName()
}
}
// TODO: Fix the actual Language implementation - Pull Request?
private class FixedLanguage(language: Language?) :