clean up

aniyomiorg · Jul 25, 2023 · a92e321 · a92e321
1 parent 1148f3c
commit a92e321
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 30 deletions.
diff --git a/...src/main/java/eu/kanade/SYDomainModule.kt → ...n/java/eu/kanade/domain/SYDomainModule.kt b/...src/main/java/eu/kanade/SYDomainModule.kt → ...n/java/eu/kanade/domain/SYDomainModule.kt
@@ -1,4 +1,4 @@
-package eu.kanade
+package eu.kanade.domain
 
 import eu.kanade.domain.source.manga.interactor.ToggleExcludeFromMangaDataSaver
 import uy.kohesive.injekt.api.InjektModule

diff --git a/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetEnabledMangaSources.kt b/app/src/main/java/eu/kanade/domain/source/manga/interactor/GetEnabledMangaSources.kt
@@ -19,52 +19,28 @@ class GetEnabledMangaSources(
  fun subscribe(): Flow<List<Source>> {
  return combine(
  preferences.pinnedMangaSources().changes(),
+ preferences.enabledLanguages().changes(),
  combine(
- preferences.enabledLanguages().changes(),
  preferences.disabledMangaSources().changes(),
  preferences.lastUsedMangaSource().changes(),
- ) { a, b, c -> Triple(a, b, c) },
- // SY -->
- combine(
  preferences.dataSaverExcludedSources().changes(),
- preferences.sourcesTabSourcesInCategories().changes(),
- preferences.sourcesTabCategoriesFilter().changes(),
  ) { a, b, c -> Triple(a, b, c) },
- // SY <--
  repository.getMangaSources(),
- ) { pinnedMangaSourceIds, (enabledLanguages, disabledSources, lastUsedSource), (excludedFromDataSaver, sourcesInCategories, sourceCategoriesFilter), sources ->
- val sourcesAndCategories = sourcesInCategories.map {
- it.split('|').let { (source, test) -> source.toLong() to test }
- }
- val sourcesInSourceCategories = sourcesAndCategories.map { it.first }
+ ) { pinnedMangaSourceIds, enabledLanguages, (disabledSources, lastUsedSource, excludedFromDataSaver), sources ->
  sources
  .filter { it.lang in enabledLanguages || it.id == LocalMangaSource.ID }
  .filterNot { it.id.toString() in disabledSources || it.id in BlacklistedSources.HIDDEN_SOURCES }
  .sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { it.name })
  .flatMap {
  val flag = if ("${it.id}" in pinnedMangaSourceIds) Pins.pinned else Pins.unpinned
- // SY -->
- val categories = sourcesAndCategories.filter { (id) -> id == it.id }
- .map(Pair<*, String>::second)
- .toSet()
- // SY <--
  val source = it.copy(
  pin = flag,
- /*isExcludedFromDataSaver = it.id.toString() in excludedFromDataSaver,*/
- /*categories = categories,*/
+ isExcludedFromDataSaver = it.id.toString() in excludedFromDataSaver,
  )
  val toFlatten = mutableListOf(source)
  if (source.id == lastUsedSource) {
  toFlatten.add(source.copy(isUsedLast = true, pin = source.pin - Pin.Actual))
  }
- // SY -->
- categories.forEach { category ->
- toFlatten.add(source.copy(pin = source.pin - Pin.Actual))
- }
- if (sourceCategoriesFilter && Pin.Actual !in toFlatten[0].pin && source.id in sourcesInSourceCategories) {
- toFlatten.removeAt(0)
- }
- // SY <--
  toFlatten
  }
  }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -22,8 +22,8 @@ import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.disk.DiskCache
 import coil.util.DebugLogger
-import eu.kanade.SYDomainModule
 import eu.kanade.domain.DomainModule
+import eu.kanade.domain.SYDomainModule
 import eu.kanade.domain.base.BasePreferences
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.domain.ui.model.setAppCompatDelegateThemeMode

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/MangaSourcesScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/manga/source/MangaSourcesScreenModel.kt
@@ -9,6 +9,7 @@ import eu.kanade.domain.source.manga.interactor.ToggleExcludeFromMangaDataSaver
 import eu.kanade.domain.source.manga.interactor.ToggleMangaSource
 import eu.kanade.domain.source.manga.interactor.ToggleMangaSourcePin
 import eu.kanade.domain.source.service.SourcePreferences
+import eu.kanade.domain.source.service.SourcePreferences.DataSaver
 import eu.kanade.presentation.browse.manga.MangaSourceUiModel
 import eu.kanade.tachiyomi.util.system.LAST_USED_KEY
 import eu.kanade.tachiyomi.util.system.PINNED_KEY
@@ -56,7 +57,7 @@ class MangaSourcesScreenModel(
  .onEach {
  mutableState.update {
  it.copy(
- dataSaverEnabled = sourcePreferences.dataSaver().get() != SourcePreferences.DataSaver.NONE,
+ dataSaverEnabled = sourcePreferences.dataSaver().get() != DataSaver.NONE,
  )
  }
  }