Migrate Source Filter Screen to Compose (#7031)

* Migrate Source Filter Screen to Compose * Changes from Review and some more fixes * Rename some variable and classes * Review Change * Ewbase and Review changes
2022-04-30 08:49:02 -07:00
parent cccd09fb5c
commit 23f8f35354
14 changed files with 324 additions and 123 deletions
@@ -1,14 +0,0 @@
-package eu.kanade.domain.source.interactor
-
-import eu.kanade.domain.source.model.Source
-import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.util.preference.plusAssign
-
-class DisableSource(
-    private val preferences: PreferencesHelper
-) {
-
-    fun await(source: Source) {
-        preferences.disabledSources() += source.id.toString()
-    }
-}
@@ -0,0 +1,35 @@
+package eu.kanade.domain.source.interactor
+
+import eu.kanade.domain.source.model.Source
+import eu.kanade.domain.source.repository.SourceRepository
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.util.system.LocaleHelper
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+
+class GetLanguagesWithSources(
+    private val repository: SourceRepository,
+    private val preferences: PreferencesHelper,
+) {
+
+    fun subscribe(): Flow<Map<String, List<Source>>> {
+        return combine(
+            preferences.enabledLanguages().asFlow(),
+            preferences.disabledSources().asFlow(),
+            repository.getOnlineSources()
+        ) { enabledLanguage, disabledSource, onlineSources ->
+            val sortedSources = onlineSources.sortedWith(
+                compareBy<Source> { it.id.toString() in disabledSource }
+                    .thenBy(String.CASE_INSENSITIVE_ORDER) { it.name }
+            )
+
+            sortedSources.groupBy { it.lang }
+                .toSortedMap(
+                    compareBy(
+                        { it !in enabledLanguage },
+                        { LocaleHelper.getDisplayName(it) }
+                    )
+                )
+        }
+    }
+}
@@ -0,0 +1,19 @@
+package eu.kanade.domain.source.interactor
+
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.util.preference.minusAssign
+import eu.kanade.tachiyomi.util.preference.plusAssign
+
+class ToggleLanguage(
+    val preferences: PreferencesHelper
+) {
+
+    fun await(language: String) {
+        val isEnabled = language in preferences.enabledLanguages().get()
+        if (isEnabled) {
+            preferences.enabledLanguages() -= language
+        } else {
+            preferences.enabledLanguages() += language
+        }
+    }
+}
@@ -0,0 +1,20 @@
+package eu.kanade.domain.source.interactor
+
+import eu.kanade.domain.source.model.Source
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.util.preference.minusAssign
+import eu.kanade.tachiyomi.util.preference.plusAssign
+
+class ToggleSource(
+    private val preferences: PreferencesHelper
+) {
+
+    fun await(source: Source) {
+        val isEnabled = source.id.toString() !in preferences.disabledSources().get()
+        if (isEnabled) {
+            preferences.disabledSources() += source.id.toString()
+        } else {
+            preferences.disabledSources() -= source.id.toString()
+        }
+    }
+}
@@ -7,5 +7,7 @@ interface SourceRepository {

    fun getSources(): Flow<List<Source>>

+    fun getOnlineSources(): Flow<List<Source>>
+
    fun getSourcesWithFavoriteCount(): Flow<List<Pair<Source, Long>>>
 }