diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt index 4b81b29eb..6c1ca0f46 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt @@ -196,25 +196,26 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att } subscriptions += controller.reorganizeRelay - .subscribe { - if (it.first == category.id) { - var items = when (it.second) { + .subscribe { + if (it.first == category.id) { + var items = when (it.second) { 1, 2 -> adapter.currentItems.sortedBy { - if (preferences.removeArticles().getOrDefault()) +// if (preferences.removeArticles().getOrDefault()) it.manga.title.removeArticles() - else - it.manga.title - } - 3, 4 -> adapter.currentItems.sortedBy { it.manga.last_update } - else -> adapter.currentItems.sortedBy { it.manga.title } +// else +// it.manga.title + } + 3, 4 -> adapter.currentItems.sortedBy { it.manga.last_update } + else -> adapter.currentItems.sortedBy { it.manga.title } } if (it.second % 2 == 0) items = items.reversed() - adapter.setItems(items) + runBlocking { adapter.setItems(this, items) } adapter.notifyDataSetChanged() onItemReleased(0) } } +// } } fun onRecycle() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt index 516d31317..72ca60e36 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt @@ -3,6 +3,8 @@ package eu.kanade.tachiyomi.ui.library import android.view.View import com.bumptech.glide.load.engine.DiskCacheStrategy import eu.davidea.flexibleadapter.FlexibleAdapter +import androidx.recyclerview.widget.RecyclerView +import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.data.glide.GlideApp import eu.kanade.tachiyomi.data.glide.toMangaThumbnail import eu.kanade.tachiyomi.source.LocalSource diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt index ce30395de..5cfac5501 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt @@ -2,6 +2,8 @@ package eu.kanade.tachiyomi.ui.library import android.view.View import eu.davidea.flexibleadapter.FlexibleAdapter +import androidx.recyclerview.widget.RecyclerView +import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt index f5fc5bb20..2171799de 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt @@ -3,6 +3,8 @@ package eu.kanade.tachiyomi.ui.library import android.view.View import com.bumptech.glide.load.engine.DiskCacheStrategy import eu.davidea.flexibleadapter.FlexibleAdapter +import androidx.recyclerview.widget.RecyclerView +import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.data.glide.GlideApp import eu.kanade.tachiyomi.data.glide.toMangaThumbnail import eu.kanade.tachiyomi.source.LocalSource diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index e0afff2a3..9ff65a535 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -231,9 +231,9 @@ class LibraryPresenter( } private fun sortAlphabetical(i1: LibraryItem, i2: LibraryItem): Int { - return if (preferences.removeArticles().getOrDefault()) - i1.manga.title.removeArticles().compareTo(i2.manga.title.removeArticles(), true) - else i1.manga.title.compareTo(i2.manga.title, true) + //return if (preferences.removeArticles().getOrDefault()) + return i1.manga.title.removeArticles().compareTo(i2.manga.title.removeArticles(), true) + //else i1.manga.title.compareTo(i2.manga.title, true) } /**