|
|
@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.library
|
|
|
|
|
|
|
|
|
|
|
|
import android.os.Bundle
|
|
|
|
import android.os.Bundle
|
|
|
|
import com.jakewharton.rxrelay.BehaviorRelay
|
|
|
|
import com.jakewharton.rxrelay.BehaviorRelay
|
|
|
|
|
|
|
|
import eu.kanade.tachiyomi.R
|
|
|
|
import eu.kanade.tachiyomi.data.cache.CoverCache
|
|
|
|
import eu.kanade.tachiyomi.data.cache.CoverCache
|
|
|
|
import eu.kanade.tachiyomi.data.database.DatabaseHelper
|
|
|
|
import eu.kanade.tachiyomi.data.database.DatabaseHelper
|
|
|
|
import eu.kanade.tachiyomi.data.database.models.Category
|
|
|
|
import eu.kanade.tachiyomi.data.database.models.Category
|
|
|
@ -201,7 +202,7 @@ class LibraryPresenter(
|
|
|
|
db.getTotalChapterManga().executeAsBlocking().associate { it.id!! to counter++ }
|
|
|
|
db.getTotalChapterManga().executeAsBlocking().associate { it.id!! to counter++ }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
val catListing by lazy {
|
|
|
|
val catListing by lazy {
|
|
|
|
val default = Category.createDefault()
|
|
|
|
val default = Category.createDefault(context)
|
|
|
|
val defOrder = preferences.defaultMangaOrder().getOrDefault()
|
|
|
|
val defOrder = preferences.defaultMangaOrder().getOrDefault()
|
|
|
|
if (defOrder.firstOrNull()?.isLetter() == true) default.mangaSort = defOrder.first()
|
|
|
|
if (defOrder.firstOrNull()?.isLetter() == true) default.mangaSort = defOrder.first()
|
|
|
|
else default.mangaOrder = defOrder.split("/").mapNotNull { it.toLongOrNull() }
|
|
|
|
else default.mangaOrder = defOrder.split("/").mapNotNull { it.toLongOrNull() }
|
|
|
@ -285,7 +286,8 @@ class LibraryPresenter(
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private fun getLibraryObservable(): Observable<Library> {
|
|
|
|
private fun getLibraryObservable(): Observable<Library> {
|
|
|
|
return Observable.combineLatest(getCategoriesObservable(), getLibraryMangasObservable()) { dbCategories, libraryManga ->
|
|
|
|
return Observable.combineLatest(getCategoriesObservable(), getLibraryMangasObservable()) { dbCategories, libraryManga ->
|
|
|
|
val categories = if (libraryManga.containsKey(0)) arrayListOf(Category.createDefault()) + dbCategories
|
|
|
|
val categories = if (libraryManga.containsKey(0)) arrayListOf(Category.createDefault
|
|
|
|
|
|
|
|
(context.applicationContext)) + dbCategories
|
|
|
|
else dbCategories
|
|
|
|
else dbCategories
|
|
|
|
|
|
|
|
|
|
|
|
this.categories = categories
|
|
|
|
this.categories = categories
|
|
|
|