Refactoring

Create sets using DSL

easydnd/src/main/java/ru/checka/easydnd/DragAndDropDslFacade.kt

@@ -1,5 +1,7 @@
 package ru.checka.easydnd
 
+import android.view.View
+
 @ConfigMarker
 class DragAndDropDslFacade<S, R>(
     private val dragAndDropManager: DragAndDropManager<S, R>
@@ -10,11 +12,18 @@ class DragAndDropDslFacade<S, R>(
         newReceivers: Set<DragAndDropObject<R>>,
         init: (DragAndDropLocalConfig<S, R>.() -> Unit)? = null
     ) {
+        var localConfig: DragAndDropLocalConfig<S, R>? = null
         if (init != null) {
-            val localConfig = DragAndDropLocalConfig<S, R>()
+            localConfig = DragAndDropLocalConfig<S, R>()
             localConfig.init()
-            dragAndDropManager.mapSets(newSenders, newReceivers, localConfig)
         }
+        dragAndDropManager.mapSets(newSenders, newReceivers, localConfig)
+    }
+
+    fun mapSets(init: (DslSetConfig<S, R>.() -> Unit)) {
+        val dslSetConfig = DslSetConfig<S, R>()
+        dslSetConfig.init()
+        mapSets(dslSetConfig.senders, dslSetConfig.receivers, dslSetConfig.localConfigInit)
     }
 
     fun default(init: (DragAndDropDefaultConfig<S, R>.() -> Unit)) {
@@ -23,4 +32,28 @@ class DragAndDropDslFacade<S, R>(
 
 
 
-}
+}
+
+@ConfigMarker
+class DslSetConfig<S, R> {
+
+    internal var localConfigInit: (DragAndDropLocalConfig<S, R>.() -> Unit)? = null
+
+    internal var senders: MutableSet<DragAndDropObject<S>> = mutableSetOf()
+
+    internal var receivers: MutableSet<DragAndDropObject<R>> = mutableSetOf()
+
+    fun config(init: (DragAndDropLocalConfig<S, R>.() -> Unit)?) {
+        localConfigInit = init
+    }
+
+    infix fun View.assignSender(assigned: S) {
+        senders.add(DragAndDropObject(this, assigned))
+    }
+
+    infix fun View.assignReceiver(assigned: R) {
+        receivers.add(DragAndDropObject(this, assigned))
+    }
+
+}
+