Compare commits

..

No commits in common. "main" and "v.0.0.3" have entirely different histories.

5 changed files with 36 additions and 50 deletions

View File

@ -1,6 +1,7 @@
name: Publish
on:
push:
release:
# We'll run this workflow when a new GitHub release is created
types: [released]

View File

@ -27,7 +27,7 @@ To include Unbound Drag & Drop in your project, add the following dependency to
file:
```kotlin
implementation("dev.adriankuta:unbound-drag-drop:0.1.0")
implementation("dev.adriankuta:unbound-drag-drop:0.0.2")
```
## Usage

View File

@ -7,7 +7,7 @@ plugins {
android {
namespace = "dev.adriankuta.unbounddragdrop"
version = "0.1.0"
version = "0.0.3"
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
@ -15,7 +15,7 @@ android {
mavenPublishing {
coordinates("dev.adriankuta", "unbound-drag-drop", version.toString())
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)
signAllPublications()
pom {
name = "Unbound Drag & Drop"

View File

@ -6,15 +6,15 @@ import android.view.View
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.RecyclerView.DRAG_FLAG_OPAQUE
import androidx.recyclerview.widget.RecyclerView.ViewHolder
/**
* Helper class to handle drag and drop functionality in multiple RecyclerViews.
* Helper class to handle drag and drop functionality in a RecyclerView.
*
* @param callback A Callback object to handle the drag and drop events.
*/
class DragDropHelper(private val callback: Callback) : RecyclerView.OnChildAttachStateChangeListener {
private val recyclerViews = mutableListOf<RecyclerView>()
private val recyclerItemClickListeners = mutableMapOf<RecyclerView, RecyclerItemClickListener>()
class DragDropHelper(callback: Callback) :
RecyclerView.OnChildAttachStateChangeListener {
private var mRecyclerView: RecyclerView? = null
private var recyclerItemClickListener: RecyclerItemClickListener? = null
private val dropListener = DropListener(callback)
private val onItemLongClickListener: RecyclerItemClickListener.OnItemLongClickListener by lazy {
object : RecyclerItemClickListener.OnItemLongClickListener {
@ -39,42 +39,30 @@ class DragDropHelper(private val callback: Callback) : RecyclerView.OnChildAttac
* @param recyclerView The RecyclerView to attach to.
*/
fun attachToRecyclerView(recyclerView: RecyclerView?) {
recyclerView?.let {
if (recyclerViews.contains(it)) return // already attached
recyclerViews.add(it)
setupCallbacks(it)
if (mRecyclerView === recyclerView) {
return // nothing to do
}
}
/**
* Detaches the DragDropHelper from the specified RecyclerView.
*
* @param recyclerView The RecyclerView to detach from.
*/
fun detachFromRecyclerView(recyclerView: RecyclerView?) {
recyclerView?.let {
if (!recyclerViews.contains(it)) return // not attached
destroyCallbacks(it)
recyclerViews.remove(it)
if (mRecyclerView != null) {
destroyCallbacks()
}
mRecyclerView = recyclerView
mRecyclerView?.let {
setupCallbacks()
}
}
/**
* Sets up the necessary callbacks for the RecyclerView.
*
* @param recyclerView The RecyclerView to setup callbacks for.
*/
private fun setupCallbacks(recyclerView: RecyclerView) {
recyclerView.apply {
val clickListener = RecyclerItemClickListener(
private fun setupCallbacks() {
mRecyclerView?.apply {
recyclerItemClickListener = RecyclerItemClickListener(
context,
this,
onItemLongClickListener
)
recyclerItemClickListeners[this] = clickListener
addOnItemTouchListener(clickListener)
).also {
mRecyclerView?.addOnItemTouchListener(it)
}
addOnChildAttachStateChangeListener(this@DragDropHelper)
setOnDragListener(dropListener)
}
@ -82,16 +70,13 @@ class DragDropHelper(private val callback: Callback) : RecyclerView.OnChildAttac
/**
* Removes the callbacks from the RecyclerView.
*
* @param recyclerView The RecyclerView to remove callbacks from.
*/
private fun destroyCallbacks(recyclerView: RecyclerView) {
recyclerItemClickListeners[recyclerView]?.let {
recyclerView.removeOnItemTouchListener(it)
recyclerItemClickListeners.remove(recyclerView)
private fun destroyCallbacks() {
recyclerItemClickListener?.let {
mRecyclerView?.removeOnItemTouchListener(it)
}
recyclerView.removeOnChildAttachStateChangeListener(this)
recyclerView.setOnDragListener(null)
mRecyclerView?.removeOnChildAttachStateChangeListener(this)
mRecyclerView?.setOnDragListener(null)
}
/**
@ -148,4 +133,4 @@ class DragDropHelper(private val callback: Callback) : RecyclerView.OnChildAttac
targetViewHolder: ViewHolder?
)
}
}
}

View File

@ -1,19 +1,19 @@
[versions]
androidGradlePlugin = "8.1.4"
agp = "8.5.1"
kotlin = "1.9.24"
agp = "8.5.0"
kotlin = "1.9.0"
coreKtx = "1.13.1"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
junitVersion = "1.1.5"
espressoCore = "3.5.1"
appcompat = "1.7.0"
kotlinxCoroutinesAndroid = "1.7.3"
lifecycleViewmodelKtx = "2.8.4"
lifecycleViewmodelKtx = "2.8.2"
material = "1.12.0"
activity = "1.9.1"
activity = "1.9.0"
constraintlayout = "2.1.4"
timber = "5.0.1"
unboundDragDrop = "0.1.0"
unboundDragDrop = "0.0.1"
[libraries]
android-tools-build-gradle-plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }