From 4a07cb27c434bc5e101fd2afda5304f6238a8e05 Mon Sep 17 00:00:00 2001 From: Priyansh-Kedia Date: Fri, 23 Oct 2020 18:08:35 +0530 Subject: [PATCH 1/9] swipe to delete --- .../com/kedia/swipetodelete/DragAndDrop.kt | 114 ------------------ .../kedia/customswipelibrary/MainActivity.kt | 3 - 2 files changed, 117 deletions(-) delete mode 100644 SwipeToDelete/src/main/java/com/kedia/swipetodelete/DragAndDrop.kt diff --git a/SwipeToDelete/src/main/java/com/kedia/swipetodelete/DragAndDrop.kt b/SwipeToDelete/src/main/java/com/kedia/swipetodelete/DragAndDrop.kt deleted file mode 100644 index 3e23133..0000000 --- a/SwipeToDelete/src/main/java/com/kedia/swipetodelete/DragAndDrop.kt +++ /dev/null @@ -1,114 +0,0 @@ -package com.kedia.swipetodelete - -import android.view.GestureDetector -import android.view.MotionEvent -import android.view.View -import androidx.recyclerview.widget.ItemTouchHelper -import androidx.recyclerview.widget.RecyclerView - -object DragAndDrop: View.OnTouchListener, GestureDetector.OnGestureListener { - - private lateinit var gestureDetector: GestureDetector - private lateinit var touchHelper: ItemTouchHelper - - private lateinit var holder: RecyclerView.ViewHolder - - fun RecyclerView.addDragToSwipe(): ItemTouchHelper { - - val itemTouchCallback = object : ItemTouchHelper.Callback() { - override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) { - super.onSelectedChanged(viewHolder, actionState) - if (actionState == ItemTouchHelper.ACTION_STATE_DRAG) { - viewHolder!!.itemView.alpha = 0.2f - } - } - - override fun clearView(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder) { - super.clearView(recyclerView, viewHolder) - viewHolder.itemView.alpha = 1f - } - - override fun isItemViewSwipeEnabled(): Boolean { - return false - } - - override fun isLongPressDragEnabled(): Boolean { - return false - } - - override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int { - holder = viewHolder - holder.itemView.setGestures() - val drags = - ItemTouchHelper.START or ItemTouchHelper.END or ItemTouchHelper.UP or ItemTouchHelper.DOWN - return makeMovementFlags( - drags, - 0 - ) - } - - override fun onMove( - recyclerView: RecyclerView, - viewHolder: RecyclerView.ViewHolder, - target: RecyclerView.ViewHolder - ): Boolean { - adapter?.notifyItemMoved(viewHolder.adapterPosition, target.adapterPosition) - return true - } - - override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {} - - } - - - val itemTouchHelper = ItemTouchHelper(itemTouchCallback) - itemTouchHelper.attachToRecyclerView(this) - touchHelper = itemTouchHelper - return itemTouchHelper - } - - - fun View.setGestures() { - gestureDetector = GestureDetector(this.context, this@DragAndDrop) - this.setOnTouchListener(this@DragAndDrop) - } - - override fun onTouch(v: View?, event: MotionEvent?): Boolean { - gestureDetector.onTouchEvent(event) - return true - } - - override fun onDown(e: MotionEvent?): Boolean { - return false - } - - override fun onShowPress(e: MotionEvent?) {} - - override fun onSingleTapUp(e: MotionEvent?): Boolean { - - return false - } - - override fun onScroll( - e1: MotionEvent?, - e2: MotionEvent?, - distanceX: Float, - distanceY: Float - ): Boolean { - return false - } - - override fun onLongPress(e: MotionEvent?) { - touchHelper.startDrag(holder) - } - - override fun onFling( - e1: MotionEvent?, - e2: MotionEvent?, - velocityX: Float, - velocityY: Float - ): Boolean { - return false - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt index e134c23..47951cd 100644 --- a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt +++ b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt @@ -3,7 +3,6 @@ package com.kedia.customswipelibrary import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager -import com.kedia.swipetodelete.DragAndDrop.addDragToSwipe import com.kedia.swipetodelete.SwipeToDelete import com.kedia.swipetodelete.SwipeToDelete.addSwipeToDelete import kotlinx.android.synthetic.main.activity_main.* @@ -26,8 +25,6 @@ class MainActivity : AppCompatActivity(), SwipeToDelete.OnSwiped { adapter = this@MainActivity.adapter } - recycler.addDragToSwipe() - val list = listOf(SwipeToDelete.DIRECTION.LEFT, SwipeToDelete.DIRECTION.RIGHT) recycler.addSwipeToDelete(list, this) From 7ac91400704d2de4bdc8449c84a98289dba6426a Mon Sep 17 00:00:00 2001 From: Priyansh-Kedia Date: Fri, 23 Oct 2020 18:38:12 +0530 Subject: [PATCH 2/9] minor bug fix in interface method --- .../src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt | 2 +- app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt b/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt index 626bbaf..b303787 100644 --- a/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt +++ b/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt @@ -28,8 +28,8 @@ object SwipeToDelete { } override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { - this@addSwipeToDelete.adapter?.notifyItemRemoved(viewHolder.adapterPosition) listener?.swipeToDelete(adapterPosition = viewHolder.adapterPosition) + this@addSwipeToDelete.adapter?.notifyItemRemoved(viewHolder.adapterPosition) } } diff --git a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt index 47951cd..f12599c 100644 --- a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt +++ b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt @@ -1,6 +1,7 @@ package com.kedia.customswipelibrary import android.os.Bundle +import android.util.Log import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import com.kedia.swipetodelete.SwipeToDelete @@ -31,6 +32,6 @@ class MainActivity : AppCompatActivity(), SwipeToDelete.OnSwiped { } override fun swipeToDelete(adapterPosition: Int) { - + Log.d("TAG!!!!", adapterPosition.toString()); } } \ No newline at end of file From 17fcec547569b7559f462066b9ac041dc6a8b9c5 Mon Sep 17 00:00:00 2001 From: Priyansh-Kedia Date: Sat, 24 Oct 2020 00:09:14 +0530 Subject: [PATCH 3/9] added implementation for interface method --- app/src/main/java/com/kedia/customswipelibrary/Adapter.kt | 6 +++++- .../main/java/com/kedia/customswipelibrary/MainActivity.kt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kedia/customswipelibrary/Adapter.kt b/app/src/main/java/com/kedia/customswipelibrary/Adapter.kt index f753b85..61e6360 100644 --- a/app/src/main/java/com/kedia/customswipelibrary/Adapter.kt +++ b/app/src/main/java/com/kedia/customswipelibrary/Adapter.kt @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView class Adapter( private val context: Context, - private val list: List + private val list: MutableList ): RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomViewHolder { @@ -24,6 +24,10 @@ class Adapter( holder.bind(list[position]) } + fun removeItem(adapterPosition: Int) { + list.removeAt(adapterPosition) + } + inner class CustomViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { private var textView = itemView.findViewById(R.id.textView) diff --git a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt index f12599c..78a97a6 100644 --- a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt +++ b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt @@ -32,6 +32,6 @@ class MainActivity : AppCompatActivity(), SwipeToDelete.OnSwiped { } override fun swipeToDelete(adapterPosition: Int) { - Log.d("TAG!!!!", adapterPosition.toString()); + adapter.removeItem(adapterPosition) } } \ No newline at end of file From a54a11cf2b2158d929711f8eb0f769a5b4b55f36 Mon Sep 17 00:00:00 2001 From: Priyansh-Kedia Date: Sat, 24 Oct 2020 11:57:27 +0530 Subject: [PATCH 4/9] updated README --- README.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 509f9f4..d3bcc2c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,56 @@ # SwipeLibrary -Extension Library to add swipe functionality to the RecyclerView +SwipeLibrary provides extension functions for handling swipe actions in RecyclerView. + +You can add **Swipe To Delete** and **Drag and Shift** like functionalities with just one line of code. + + +# Extension Functions + +SwipeLibrary contains the following functions: +- [Swipe To Delete](#swipe-to-delete) +- [Drag to Shift](#drag-to-shift) + +## Swipe To Delete + +Add swipe to delete RecyclerView's items from the list, which a single line of code. + +Use *addSwipeToDelete* as RecyclerView's extension function, to add this functionality to your RecyclerView. +This extension function has **two** optional parameter. +> The first parameter is the list of directions in which swipe should be allowed. The directions can be either **TOP**, **BOTTOM**, **RIGHT**, **LEFT**. +The list of directions can be made like this, + `val list = listOf(SwipeToDelete.DIRECTION.LEFT,SwipeToDelete.DIRECTION.RIGHT)` +If no value is passed for the list, by default, **RIGHT** is the direction for swipe. + +> The second parameter is the *listener* for the interface method. The by default value of this parameter is null. If passed, the activity/fragment should implement `SwipeToDelete.OnSwiped`. This method will be called when the RecyclerView item is swiped out, and it returns the position of the element that was swiped. + +**Implementation of interface method** +In a notes app, if you wish to delete the note from your database, after it is swiped, then you can used this method to perform the action. The note can be deleted by getting the *NOTE* using the adapter position inside the list passed to RecyclerView Adapter. + + override fun swipeToDelete(adapterPosition: Int) { + adapter.removeItem(adapterPosition) + } + +[![rec-2020-10-24_00.08.27.gif](https://s8.gifyu.com/images/rec-2020-10-24_00.08.27.gif)](https://gifyu.com/image/8jlD) + + +--- +*** +___ + +## Drag To Shift + +Highlight, move and shift items of RecyclerView with just a single line of code. +Use *addDragToSwipe* as RecyclerView's extension function, to add this functionality to your RecyclerView. This extension has **one** optional parameter. + +> The parameter is the listener for the interface method. The by default value for this parameter is null. If passed, the activity/fragment should implement `DragAndDrop.onDragged`. This method will be called when the RecyclerView item is dragged and dropped to some other position, and it returns the two positions that were swapped. + +**Implementation of interface method** :- +In a notes app, if you wish to change positions of two notes in your database, after they are swapped, then you can used this method to perform the action. The notes can be swapped by getting the _NOTES_ using the adapter positions inside the list passed to RecyclerView Adapter. + + override fun onPositionDragged(positionStart: Int, positionEnd: Int) { + adapter.moveItem(positionStart, positionEnd) + } + +[![rec-2020-10-24_00.10.0459f8d3ce489a4f0f.gif](https://s8.gifyu.com/images/rec-2020-10-24_00.10.0459f8d3ce489a4f0f.gif)](https://gifyu.com/image/8jl5) + From 594c92708ea210eeb1d4c2928aa3065de5043498 Mon Sep 17 00:00:00 2001 From: Priyansh-Kedia Date: Sat, 24 Oct 2020 13:38:12 +0530 Subject: [PATCH 5/9] minor change --- .../src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt b/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt index b303787..87a282c 100644 --- a/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt +++ b/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt @@ -1,9 +1,13 @@ package com.kedia.swipetodelete +import android.R +import android.graphics.* +import android.view.View import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper.RIGHT import androidx.recyclerview.widget.RecyclerView + object SwipeToDelete { fun RecyclerView.addSwipeToDelete( @@ -31,7 +35,6 @@ object SwipeToDelete { listener?.swipeToDelete(adapterPosition = viewHolder.adapterPosition) this@addSwipeToDelete.adapter?.notifyItemRemoved(viewHolder.adapterPosition) } - } ItemTouchHelper(simpleCallback).attachToRecyclerView(this) } From 3e7f52dda1b73a28b590fa36eb69b53e602c7af5 Mon Sep 17 00:00:00 2001 From: Priyansh-Kedia Date: Sat, 24 Oct 2020 14:34:32 +0530 Subject: [PATCH 6/9] added color options --- .../com/kedia/swipetodelete/SwipeToDelete.kt | 50 +++++++++++++++++-- .../src/main/res/drawable/ic_background.xml | 8 +++ .../kedia/customswipelibrary/MainActivity.kt | 4 +- 3 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 SwipeToDelete/src/main/res/drawable/ic_background.xml diff --git a/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt b/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt index 87a282c..d45aa2f 100644 --- a/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt +++ b/SwipeToDelete/src/main/java/com/kedia/swipetodelete/SwipeToDelete.kt @@ -1,18 +1,21 @@ package com.kedia.swipetodelete -import android.R -import android.graphics.* -import android.view.View +import android.graphics.Canvas +import android.graphics.Color +import androidx.annotation.ColorInt import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper.RIGHT import androidx.recyclerview.widget.RecyclerView +import java.lang.Exception object SwipeToDelete { fun RecyclerView.addSwipeToDelete( list: List = emptyList(), - listener: OnSwiped? = null + listener: OnSwiped? = null, + @ColorInt colorOneInt: Int? = null, + @ColorInt colorTwoInt: Int? = null ) { var swipeDirs = RIGHT @@ -35,10 +38,49 @@ object SwipeToDelete { listener?.swipeToDelete(adapterPosition = viewHolder.adapterPosition) this@addSwipeToDelete.adapter?.notifyItemRemoved(viewHolder.adapterPosition) } + + override fun onChildDraw( + c: Canvas, + recyclerView: RecyclerView, + viewHolder: RecyclerView.ViewHolder, + dX: Float, + dY: Float, + actionState: Int, + isCurrentlyActive: Boolean + ) { + c.clipRect(0f, viewHolder.itemView.top.toFloat(), + dX, viewHolder.itemView.bottom.toFloat()) + + if (colorTwoInt != null && colorOneInt == null) + throw Exception("Color One cannot be null if Color Two is non null") + + if (colorTwoInt == null) { + colorOneInt?.apply { c.drawColor(this) } + } else { + if(dX < width / 2) + colorOneInt?.apply { c.drawColor(this) } + else + colorTwoInt?.apply { c.drawColor(this) } + } + + super.onChildDraw( + c, + recyclerView, + viewHolder, + dX, + dY, + actionState, + isCurrentlyActive + ) + } } ItemTouchHelper(simpleCallback).attachToRecyclerView(this) } + private fun Float.isPositive(): Boolean { + return this > 0 + } + interface OnSwiped { fun swipeToDelete(adapterPosition: Int) } diff --git a/SwipeToDelete/src/main/res/drawable/ic_background.xml b/SwipeToDelete/src/main/res/drawable/ic_background.xml new file mode 100644 index 0000000..f4622a1 --- /dev/null +++ b/SwipeToDelete/src/main/res/drawable/ic_background.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt index 78a97a6..031711b 100644 --- a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt +++ b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt @@ -3,6 +3,8 @@ package com.kedia.customswipelibrary import android.os.Bundle import android.util.Log import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.ContextCompat +import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.LinearLayoutManager import com.kedia.swipetodelete.SwipeToDelete import com.kedia.swipetodelete.SwipeToDelete.addSwipeToDelete @@ -28,7 +30,7 @@ class MainActivity : AppCompatActivity(), SwipeToDelete.OnSwiped { val list = listOf(SwipeToDelete.DIRECTION.LEFT, SwipeToDelete.DIRECTION.RIGHT) - recycler.addSwipeToDelete(list, this) + recycler.addSwipeToDelete(list, this, ContextCompat.getColor(this, R.color.colorAccent), ContextCompat.getColor(this, R.color.colorPrimaryDark)) } override fun swipeToDelete(adapterPosition: Int) { From e2768ac7465bdb9b8b40c80362ad651bce207ee8 Mon Sep 17 00:00:00 2001 From: Priyansh Kedia Date: Sat, 24 Oct 2020 14:40:53 +0530 Subject: [PATCH 7/9] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d3bcc2c..b63e434 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,9 @@ In a notes app, if you wish to delete the note from your database, after it is s adapter.removeItem(adapterPosition) } -[![rec-2020-10-24_00.08.27.gif](https://s8.gifyu.com/images/rec-2020-10-24_00.08.27.gif)](https://gifyu.com/image/8jlD) +> The third parameter is an optional parameter, for the Color integer, if the user wants a color in the background when the view is swiped out. This is how the user can pass the Color int as the parameter, `ContextCompat.getColor(this, R.color.colorAccent)` + +[![rec-2020-10-24_14.38.15.gif](https://s8.gifyu.com/images/rec-2020-10-24_14.38.15.gif)](https://gifyu.com/image/8FMg) --- From a6b6a6bf4973eacfcac9dfa40c4692f9170c4d8b Mon Sep 17 00:00:00 2001 From: Priyansh Kedia Date: Sat, 24 Oct 2020 14:45:41 +0530 Subject: [PATCH 8/9] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index b63e434..0167a20 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,11 @@ In a notes app, if you wish to delete the note from your database, after it is s [![rec-2020-10-24_14.38.15.gif](https://s8.gifyu.com/images/rec-2020-10-24_14.38.15.gif)](https://gifyu.com/image/8FMg) +> The fourth parameter is an optional parameter, for the second Color integer, if the user wants two colors in the background, the user can pass both **Parameter 3 and Parameter 4**. + +[![rec-2020-10-24_14.43.59.gif](https://s8.gifyu.com/images/rec-2020-10-24_14.43.59.gif)](https://gifyu.com/image/8Fpk) + + --- *** ___ From 8539c40131909189e553ca1081af4e48814c40a0 Mon Sep 17 00:00:00 2001 From: Priyansh-Kedia Date: Sat, 24 Oct 2020 14:46:49 +0530 Subject: [PATCH 9/9] added color --- app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt index 031711b..a807125 100644 --- a/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt +++ b/app/src/main/java/com/kedia/customswipelibrary/MainActivity.kt @@ -30,7 +30,7 @@ class MainActivity : AppCompatActivity(), SwipeToDelete.OnSwiped { val list = listOf(SwipeToDelete.DIRECTION.LEFT, SwipeToDelete.DIRECTION.RIGHT) - recycler.addSwipeToDelete(list, this, ContextCompat.getColor(this, R.color.colorAccent), ContextCompat.getColor(this, R.color.colorPrimaryDark)) + recycler.addSwipeToDelete(list, this) } override fun swipeToDelete(adapterPosition: Int) {