Change deprecated code from RecyclerView.ViewHolder

pull/2528/head
kmj-99 2 years ago committed by Alex Baker
parent 3a6086adbd
commit 417a1cca46

@ -86,8 +86,8 @@ public class BeastModeRecyclerAdapter extends RecyclerView.Adapter<BeastModeView
@Override @Override
public boolean onMove( public boolean onMove(
RecyclerView recyclerView, RecyclerView.ViewHolder from, RecyclerView.ViewHolder to) { RecyclerView recyclerView, RecyclerView.ViewHolder from, RecyclerView.ViewHolder to) {
int fromPosition = from.getAdapterPosition(); int fromPosition = from.getBindingAdapterPosition();
int toPosition = to.getAdapterPosition(); int toPosition = to.getBindingAdapterPosition();
Collections.swap(items, fromPosition, toPosition); Collections.swap(items, fromPosition, toPosition);
notifyItemMoved(fromPosition, toPosition); notifyItemMoved(fromPosition, toPosition);
return true; return true;

@ -129,7 +129,7 @@ class DragAndDropRecyclerAdapter(
taskList.startActionMode() taskList.startActionMode()
(viewHolder as TaskViewHolder?)!!.moving = true (viewHolder as TaskViewHolder?)!!.moving = true
dragging = true dragging = true
val position = viewHolder!!.adapterPosition val position = viewHolder!!.bindingAdapterPosition
updateIndents(viewHolder as TaskViewHolder?, position, position) updateIndents(viewHolder as TaskViewHolder?, position, position)
} }
} }
@ -137,19 +137,19 @@ class DragAndDropRecyclerAdapter(
override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int { override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
return when { return when {
!dragAndDropEnabled() -> NO_MOVEMENT !dragAndDropEnabled() -> NO_MOVEMENT
adapter.isHeader(viewHolder.adapterPosition) -> NO_MOVEMENT adapter.isHeader(viewHolder.bindingAdapterPosition) -> NO_MOVEMENT
adapter.numSelected > 0 -> NO_MOVEMENT adapter.numSelected > 0 -> NO_MOVEMENT
else -> ALLOW_DRAGGING else -> ALLOW_DRAGGING
} }
} }
override fun onMove( override fun onMove(
recyclerView: RecyclerView, recyclerView: RecyclerView,
src: RecyclerView.ViewHolder, src: RecyclerView.ViewHolder,
target: RecyclerView.ViewHolder): Boolean { target: RecyclerView.ViewHolder): Boolean {
taskList.finishActionMode() taskList.finishActionMode()
val fromPosition = src.adapterPosition val fromPosition = src.bindingAdapterPosition
val toPosition = target.adapterPosition val toPosition = target.bindingAdapterPosition
val source = src as TaskViewHolder val source = src as TaskViewHolder
val isHeader = isHeader(toPosition) val isHeader = isHeader(toPosition)
if (!isHeader && !adapter.canMove(source.task, fromPosition, (target as TaskViewHolder).task, toPosition)) { if (!isHeader && !adapter.canMove(source.task, fromPosition, (target as TaskViewHolder).task, toPosition)) {
@ -235,7 +235,7 @@ class DragAndDropRecyclerAdapter(
vh.indent = targetIndent vh.indent = targetIndent
moved(from, to, targetIndent) moved(from, to, targetIndent)
} else if (task.indent != targetIndent) { } else if (task.indent != targetIndent) {
val position = vh.adapterPosition val position = vh.bindingAdapterPosition
vh.task.indent = targetIndent vh.task.indent = targetIndent
vh.task.targetIndent = targetIndent vh.task.targetIndent = targetIndent
vh.indent = targetIndent vh.indent = targetIndent

@ -40,7 +40,7 @@ abstract class TaskListRecyclerAdapter internal constructor(
fun toggle(taskViewHolder: TaskViewHolder) { fun toggle(taskViewHolder: TaskViewHolder) {
adapter.toggleSelection(taskViewHolder.task) adapter.toggleSelection(taskViewHolder.task)
notifyItemChanged(taskViewHolder.adapterPosition) notifyItemChanged(taskViewHolder.bindingAdapterPosition)
if (adapter.getSelected().isEmpty()) { if (adapter.getSelected().isEmpty()) {
taskList.finishActionMode() taskList.finishActionMode()
} else { } else {

Loading…
Cancel
Save