sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-18 19:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow rewards to be reordered. Fixes #627

Browse source
This commit is contained in:
Phillip Thelen 2020-01-13 13:41:37 +01:00
parent e85c8c6bfc
commit 89bb20b56b
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
View file

@ -146,7 +146,6 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
}
itemTouchCallback = object : ItemTouchHelper.Callback() {
override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
super.onSelectedChanged(viewHolder, actionState)
if (viewHolder == null || viewHolder.adapterPosition == NO_POSITION) return
@ -166,8 +165,12 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
//defines the enabled move directions in each state (idle, swiping, dragging).
override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
return makeFlag(ItemTouchHelper.ACTION_STATE_DRAG,
ItemTouchHelper.DOWN or ItemTouchHelper.UP)
return if (recyclerAdapter?.getItemViewType(viewHolder.adapterPosition) ?: 0 == 2) {
makeFlag(ItemTouchHelper.ACTION_STATE_IDLE, 0)
} else {
makeFlag(ItemTouchHelper.ACTION_STATE_DRAG,
ItemTouchHelper.DOWN or ItemTouchHelper.UP)
}
}
override fun isItemViewSwipeEnabled(): Boolean = false
@ -242,9 +245,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
this.setInnerAdapter()
}
if (classType != Task.TYPE_REWARD) {
allowReordering()
}
allowReordering()
if (this.classType != null) {
recyclerAdapter?.errorButtonEvents?.subscribe(Consumer {