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

Refactoring on library list controller

Browse source
This commit is contained in:
Jay 2020-02-22 00:20:07 -08:00
parent c3a10692a1
commit a9bfa47a2f
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListController.kt
View file

@ -61,7 +61,7 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
private var spinnerAdapter: SpinnerAdapter? = null private var spinnerAdapter: SpinnerAdapter? = null
private var lastItemPostion:Int? = null private var lastItemPosition:Int? = null
private var lastItem:IFlexible<*>? = null private var lastItem:IFlexible<*>? = null
/** /**
@ -296,7 +296,6 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
} }
} }
/// Method for single list
override fun startReading(position: Int) { override fun startReading(position: Int) {
if (adapter.mode == SelectableAdapter.Mode.MULTI) { if (adapter.mode == SelectableAdapter.Mode.MULTI) {
toggleSelection(position) toggleSelection(position)
@ -306,11 +305,6 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
startReading(manga) startReading(manga)
} }
/**
* Tells the presenter to toggle the selection for the given position.
*
* @param position the position to toggle.
*/
private fun toggleSelection(position: Int) { private fun toggleSelection(position: Int) {
val item = adapter.getItem(position) as? LibraryItem ?: return val item = adapter.getItem(position) as? LibraryItem ?: return
@ -318,7 +312,6 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
invalidateActionMode() invalidateActionMode()
} }
override fun canDrag(): Boolean { override fun canDrag(): Boolean {
val filterOff = preferences.filterCompleted().getOrDefault() + val filterOff = preferences.filterCompleted().getOrDefault() +
preferences.filterTracked().getOrDefault() + preferences.filterTracked().getOrDefault() +
@ -336,7 +329,6 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
* @return true if the item should be selected, false otherwise. * @return true if the item should be selected, false otherwise.
*/ */
override fun onItemClick(view: View?, position: Int): Boolean { override fun onItemClick(view: View?, position: Int): Boolean {
// If the action mode is created and the position is valid, toggle the selection.
val item = adapter.getItem(position) as? LibraryItem ?: return false val item = adapter.getItem(position) as? LibraryItem ?: return false
return if (adapter.mode == SelectableAdapter.Mode.MULTI) { return if (adapter.mode == SelectableAdapter.Mode.MULTI) {
lastClickPosition = position lastClickPosition = position
@ -369,16 +361,16 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
override fun onActionStateChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) { override fun onActionStateChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
val position = viewHolder?.adapterPosition ?: return val position = viewHolder?.adapterPosition ?: return
if (actionState == 2) { if (actionState == 2) {
if (lastItemPostion != null && position != lastItemPostion if (lastItemPosition != null && position != lastItemPosition
&& lastItem == adapter.getItem(position)) { && lastItem == adapter.getItem(position)) {
// because for whatever reason you can re // because for whatever reason you can repeatedly tap on a currently dragging manga
adapter.removeSelection(position) adapter.removeSelection(position)
(recycler.findViewHolderForAdapterPosition(position) as? LibraryHolder)?.toggleActivation() (recycler.findViewHolderForAdapterPosition(position) as? LibraryHolder)?.toggleActivation()
adapter.moveItem(position, lastItemPostion!!) adapter.moveItem(position, lastItemPosition!!)
} }
else { else {
lastItem = adapter.getItem(position) lastItem = adapter.getItem(position)
lastItemPostion = position lastItemPosition = position
onItemLongClick(position) onItemLongClick(position)
} }
} }
@ -402,13 +394,13 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
} }
override fun onItemMove(fromPosition: Int, toPosition: Int) { override fun onItemMove(fromPosition: Int, toPosition: Int) {
if (lastItemPostion == toPosition) if (lastItemPosition == toPosition)
lastItemPostion = null lastItemPosition = null
} }
override fun onItemReleased(position: Int) { override fun onItemReleased(position: Int) {
if (adapter.selectedItemCount > 0) { if (adapter.selectedItemCount > 0) {
lastItemPostion = null lastItemPosition = null
return return
} }
destroyActionModeIfNeeded() destroyActionModeIfNeeded()
@ -421,7 +413,7 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
presenter.rearrangeCategory(item.manga.category, mangaIds) presenter.rearrangeCategory(item.manga.category, mangaIds)
} else { } else {
if (presenter.mangaIsInCategory(item.manga, newHeader?.category?.id)) { if (presenter.mangaIsInCategory(item.manga, newHeader?.category?.id)) {
adapter.moveItem(position, lastItemPostion!!) adapter.moveItem(position, lastItemPosition!!)
snack = snackbar_layout?.snack(R.string.already_in_category) snack = snackbar_layout?.snack(R.string.already_in_category)
return return
} }
@ -459,7 +451,7 @@ class LibraryListController(bundle: Bundle? = null) : LibraryController(bundle),
} }
} }
} }
lastItemPostion = null lastItemPosition = null
} }
override fun shouldMoveItem(fromPosition: Int, toPosition: Int): Boolean { override fun shouldMoveItem(fromPosition: Int, toPosition: Int): Boolean {