Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 08:42:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use actual indexes instead of existing order number when reordering categories

Browse Source 
Fixes #8738
This commit is contained in:
arkon 2022-12-15 23:06:05 -05:00
parent bc6a12a4f7
commit 5f4825465e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/eu/kanade/domain/category/interactor/ReorderCategory.kt
View File

@ -28,26 +28,26 @@ class ReorderCategory(
.filterNot(Category::isSystemCategory) .filterNot(Category::isSystemCategory)
.toMutableList() .toMutableList()
val newPosition = when (moveTo) {
MoveTo.UP -> category.order - 1
MoveTo.DOWN -> category.order + 1
}.toInt()
val currentIndex = categories.indexOfFirst { it.id == category.id } val currentIndex = categories.indexOfFirst { it.id == category.id }
if (currentIndex == newPosition) { if (currentIndex == -1) {
return@withNonCancellableContext Result.Unchanged return@withNonCancellableContext Result.Unchanged
} }
Collections.swap(categories, currentIndex, newPosition) val newPosition = when (moveTo) {
MoveTo.UP -> currentIndex - 1
val updates = categories.mapIndexed { index, category -> MoveTo.DOWN -> currentIndex + 1
CategoryUpdate( }.toInt()
id = category.id,
order = index.toLong(),
)
}
try { try {
Collections.swap(categories, currentIndex, newPosition)
val updates = categories.mapIndexed { index, category ->
CategoryUpdate(
id = category.id,
order = index.toLong(),
)
}
categoryRepository.updatePartial(updates) categoryRepository.updatePartial(updates)
Result.Success Result.Success
} catch (e: Exception) { } catch (e: Exception) {