mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-27 11:37:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to flow

Browse Source
This commit is contained in:
Jobobby04
2020-05-02 01:00:37 -04:00
parent 7e99a9f789
commit 0014a0ca6c
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
View File

@ -12,7 +12,6 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.data.preference.getOrDefault
import eu.kanade.tachiyomi.databinding.PreMigrationControllerBinding import eu.kanade.tachiyomi.databinding.PreMigrationControllerBinding
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
@ -98,7 +97,7 @@ class PreMigrationController(bundle: Bundle? = null) :
val listOfSources = adapter?.items?.filter { val listOfSources = adapter?.items?.filter {
it.sourceEnabled it.sourceEnabled
}?.joinToString("/") { it.source.id.toString() } }?.joinToString("/") { it.source.id.toString() }
prefs.migrationSources().set(listOfSources) prefs.migrationSources().set(listOfSources!!)
router.replaceTopController( router.replaceTopController(
MigrationListController.create( MigrationListController.create(
@ -136,7 +135,7 @@ class PreMigrationController(bundle: Bundle? = null) :
*/ */
private fun getEnabledSources(): List<HttpSource> { private fun getEnabledSources(): List<HttpSource> {
val languages = prefs.enabledLanguages().get() val languages = prefs.enabledLanguages().get()
val sourcesSaved = prefs.migrationSources().getOrDefault().split("/") val sourcesSaved = prefs.migrationSources().get().split("/")
var sources = sourceManager.getVisibleCatalogueSources() var sources = sourceManager.getVisibleCatalogueSources()
.filterIsInstance<HttpSource>() .filterIsInstance<HttpSource>()
.filter { it.lang in languages } .filter { it.lang in languages }
@ -154,7 +153,7 @@ class PreMigrationController(bundle: Bundle? = null) :
} }
fun isEnabled(id: String): Boolean { fun isEnabled(id: String): Boolean {
val sourcesSaved = prefs.migrationSources().getOrDefault() val sourcesSaved = prefs.migrationSources().get()
val hiddenCatalogues = prefs.hiddenCatalogues().get() val hiddenCatalogues = prefs.hiddenCatalogues().get()
return if (sourcesSaved.isEmpty()) id !in hiddenCatalogues return if (sourcesSaved.isEmpty()) id !in hiddenCatalogues
else sourcesSaved.split("/").contains(id) else sourcesSaved.split("/").contains(id)

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationListController.kt
View File

@ -128,7 +128,7 @@ class MigrationListController(bundle: Bundle? = null) :
val useSourceWithMost = preferences.useSourceWithMost().getOrDefault() val useSourceWithMost = preferences.useSourceWithMost().getOrDefault()
val useSmartSearch = preferences.smartMigration().getOrDefault() val useSmartSearch = preferences.smartMigration().getOrDefault()
val sources = preferences.migrationSources().getOrDefault().split("/").mapNotNull { val sources = preferences.migrationSources().get().split("/").mapNotNull {
val value = it.toLongOrNull() ?: return val value = it.toLongOrNull() ?: return
sourceManager.get(value) as? CatalogueSource sourceManager.get(value) as? CatalogueSource
} }

2
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt
View File

@ -213,7 +213,7 @@ class SettingsLibraryController : SettingsController() {
} }
} }
if (preferences.skipPreMigration().get() || preferences.migrationSources() if (preferences.skipPreMigration().get() || preferences.migrationSources()
.getOrDefault().isNotEmpty() .get().isNotEmpty()
) { ) {
switchPreference { switchPreference {
key = Keys.skipPreMigration key = Keys.skipPreMigration