github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed long press not working after switching from list to grid

Browse source
This commit is contained in:
Jay 2020-02-17 23:08:14 -08:00
parent 715507be2a
commit 21d7f342e6
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View file

@ -596,6 +596,7 @@ class LibraryController(
val position = (recycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition() val position = (recycler.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
if (recycler is AutofitRecyclerView && preferences.libraryLayout().getOrDefault() == 0 || if (recycler is AutofitRecyclerView && preferences.libraryLayout().getOrDefault() == 0 ||
recycler !is AutofitRecyclerView && preferences.libraryLayout().getOrDefault() > 0) { recycler !is AutofitRecyclerView && preferences.libraryLayout().getOrDefault() > 0) {
destroyActionModeIfNeeded()
recycler_layout.removeView(recycler) recycler_layout.removeView(recycler)
recycler = if (preferences.libraryLayout().getOrDefault() == 0) { recycler = if (preferences.libraryLayout().getOrDefault() == 0) {
(recycler_layout.inflate(R.layout.library_list_recycler) as RecyclerView).apply { (recycler_layout.inflate(R.layout.library_list_recycler) as RecyclerView).apply {
@ -614,10 +615,16 @@ class LibraryController(
} }
} }
recycler.setHasFixedSize(true) recycler.setHasFixedSize(true)
adapter = LibraryCategoryAdapter(this)
recycler.adapter = adapter
recycler.addOnScrollListener(scrollListener) recycler.addOnScrollListener(scrollListener)
adapter.isLongPressDragEnabled = canDrag()
recycler_layout.addView(recycler) recycler_layout.addView(recycler)
adapter.setItems(presenter.getList())
} else {
recycler.adapter = adapter
} }
recycler.adapter = adapter
(recycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(position, 0) (recycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(position, 0)
//val adapter = adapter ?: return //val adapter = adapter ?: return

10
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View file

@ -503,6 +503,16 @@ class LibraryPresenter(
} }
} }
fun getList(): List<LibraryItem> {
val list = mutableListOf<LibraryItem>()
for (element in currentMangaMap!!.toSortedMap(compareBy { entry ->
categories.find { it.id == entry }?.order ?: -1
})) {
list.addAll(element.value)
}
return list
}
fun updateViewBlocking() { fun updateViewBlocking() {
/* val list = withContext(Dispatchers.IO) { /* val list = withContext(Dispatchers.IO) {
val showCategories = !preferences.hideCategories().getOrDefault() val showCategories = !preferences.hideCategories().getOrDefault()