From 74065afc2712c2f68b6e71e832503bbf04c09893 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 10 Aug 2020 00:55:39 -0400 Subject: [PATCH] Hopefully fix issues with certain actions for some people --- .../ui/library/LibraryCategoryView.kt | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) 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 882cb7c88..662f9c402 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 @@ -361,19 +361,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att } // SY --> override fun onItemReleased(position: Int) { - controller.invalidateActionMode() - val mangaIds = adapter.currentItems.mapNotNull { it.manga.id } - category.mangaOrder = mangaIds - if (category.id == 0) { - preferences.defaultMangaOrder().set(mangaIds.joinToString("/")) - } else { - db.insertCategory(category).asRxObservable().subscribe() - } - if (preferences.librarySortingMode().get() != LibrarySort.DRAG_AND_DROP) { - preferences.librarySortingAscending().set(true) - preferences.librarySortingMode().set(LibrarySort.DRAG_AND_DROP) - controller.refreshSort() - } + return } override fun shouldMoveItem(fromPosition: Int, toPosition: Int): Boolean { @@ -389,7 +377,20 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att } override fun onItemMove(fromPosition: Int, toPosition: Int) { - return + if (fromPosition == toPosition) return + controller.invalidateActionMode() + val mangaIds = adapter.currentItems.mapNotNull { it.manga.id } + category.mangaOrder = mangaIds + if (category.id == 0) { + preferences.defaultMangaOrder().set(mangaIds.joinToString("/")) + } else { + db.insertCategory(category).asRxObservable().subscribe() + } + if (preferences.librarySortingMode().get() != LibrarySort.DRAG_AND_DROP) { + preferences.librarySortingAscending().set(true) + preferences.librarySortingMode().set(LibrarySort.DRAG_AND_DROP) + controller.refreshSort() + } } // SY <--