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

finish adding drag and drop

Browse Source
This commit is contained in:
Rani Sargees
2020-03-06 14:26:39 -05:00
committed by Jobobby04
parent 41c99c33a6
commit 1af11f076f
5 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
View File

@ -196,25 +196,26 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att
} }
subscriptions += controller.reorganizeRelay subscriptions += controller.reorganizeRelay
.subscribe { .subscribe {
if (it.first == category.id) { if (it.first == category.id) {
var items = when (it.second) { var items = when (it.second) {
1, 2 -> adapter.currentItems.sortedBy { 1, 2 -> adapter.currentItems.sortedBy {
if (preferences.removeArticles().getOrDefault()) // if (preferences.removeArticles().getOrDefault())
it.manga.title.removeArticles() it.manga.title.removeArticles()
else // else
it.manga.title // it.manga.title
} }
3, 4 -> adapter.currentItems.sortedBy { it.manga.last_update } 3, 4 -> adapter.currentItems.sortedBy { it.manga.last_update }
else -> adapter.currentItems.sortedBy { it.manga.title } else -> adapter.currentItems.sortedBy { it.manga.title }
} }
if (it.second % 2 == 0) if (it.second % 2 == 0)
items = items.reversed() items = items.reversed()
adapter.setItems(items) runBlocking { adapter.setItems(this, items) }
adapter.notifyDataSetChanged() adapter.notifyDataSetChanged()
onItemReleased(0) onItemReleased(0)
} }
} }
// }
} }
fun onRecycle() { fun onRecycle() {

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryGridHolder.kt
View File

@ -3,6 +3,8 @@ package eu.kanade.tachiyomi.ui.library
import android.view.View import android.view.View
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
import eu.davidea.flexibleadapter.FlexibleAdapter 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.GlideApp
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.LocalSource

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt
View File

@ -2,6 +2,8 @@ package eu.kanade.tachiyomi.ui.library
import android.view.View import android.view.View
import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.FlexibleAdapter
import androidx.recyclerview.widget.RecyclerView
import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
/** /**

2
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
View File

@ -3,6 +3,8 @@ package eu.kanade.tachiyomi.ui.library
import android.view.View import android.view.View
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
import eu.davidea.flexibleadapter.FlexibleAdapter 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.GlideApp
import eu.kanade.tachiyomi.data.glide.toMangaThumbnail import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.LocalSource

6
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -231,9 +231,9 @@ class LibraryPresenter(
} }
private fun sortAlphabetical(i1: LibraryItem, i2: LibraryItem): Int { private fun sortAlphabetical(i1: LibraryItem, i2: LibraryItem): Int {
return if (preferences.removeArticles().getOrDefault()) //return if (preferences.removeArticles().getOrDefault())
i1.manga.title.removeArticles().compareTo(i2.manga.title.removeArticles(), true) return i1.manga.title.removeArticles().compareTo(i2.manga.title.removeArticles(), true)
else i1.manga.title.compareTo(i2.manga.title, true) //else i1.manga.title.compareTo(i2.manga.title, true)
} }
/** /**