From 6934daecff5a6e6e76e7331c0ca0ea83c0943d4e Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 6 Jul 2022 12:20:48 +0300 Subject: [PATCH] Preselect new sources based on locale --- .../kotatsu/settings/newsources/NewSourcesViewModel.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt index 08ef96c49..06567642b 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt @@ -1,10 +1,12 @@ package org.koitharu.kotatsu.settings.newsources +import androidx.core.os.LocaleListCompat import androidx.lifecycle.MutableLiveData import org.koitharu.kotatsu.base.ui.BaseViewModel import org.koitharu.kotatsu.core.model.getLocaleTitle import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.settings.sources.model.SourceConfigItem +import org.koitharu.kotatsu.utils.ext.mapToSet class NewSourcesViewModel( private val settings: AppSettings, @@ -30,12 +32,14 @@ class NewSourcesViewModel( } private fun buildList() { + val locales = LocaleListCompat.getDefault().mapToSet { it.language } val hidden = settings.hiddenSources sources.value = initialList.map { + val locale = it.locale SourceConfigItem.SourceItem( source = it, summary = it.getLocaleTitle(), - isEnabled = it.name !in hidden, + isEnabled = it.name !in hidden && (locale == null || locale in locales), isDraggable = false, ) }