API 21 and greater support

STRENCH0 · Feb 12, 2019 · 53b35a3 · 53b35a3
1 parent b0fec6f
commit 53b35a3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/easydnd/build.gradle b/easydnd/build.gradle
@@ -11,7 +11,7 @@ group='com.github.STRENCH0'
 android {
     compileSdkVersion 28
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"

diff --git a/easydnd/src/main/java/ru/checka/easydnd/ConfigObjects.kt b/easydnd/src/main/java/ru/checka/easydnd/ConfigObjects.kt
@@ -2,7 +2,7 @@ package ru.checka.easydnd
 
 import android.view.View
 
-public abstract class BaseConfig<S : DragAssignment, R : DragAssignment> {
+abstract class BaseConfig<S : DragAssignment, R : DragAssignment> internal constructor(){
 
     /**
      * Calls when dropping is performed. Sender and Receiver objects of type [DragAndDropObject] will be passed as params
@@ -48,7 +48,7 @@ public abstract class BaseConfig<S : DragAssignment, R : DragAssignment> {
 /**
  * Default configuration class
  */
-public class DragAndDropDefaultConfig<S : DragAssignment, R : DragAssignment> : BaseConfig<S, R>() {
+class DragAndDropDefaultConfig<S : DragAssignment, R : DragAssignment> : BaseConfig<S, R>() {
 
     /**
      * Calls when start dragging sender. Sender [DragAndDropObject] will be passed as param
@@ -71,7 +71,7 @@ public class DragAndDropDefaultConfig<S : DragAssignment, R : DragAssignment> :
     var userAction: UserAction = UserAction.TOUCH
 
     /**
-     * Override default [ShadowBuilder]
+     * Override default [View.DragShadowBuilder]
      */
     var shadowBuilder: (View, DragAssignment) -> View.DragShadowBuilder = { view, _ -> DefaultShadowBuilder(view) }
 
@@ -100,13 +100,13 @@ public class DragAndDropDefaultConfig<S : DragAssignment, R : DragAssignment> :
 /**
  * Additional configuration which can override default behavior of [DragAndDropDefaultConfig]
  */
-public class DragAndDropLocalConfig<S : DragAssignment, R : DragAssignment> : BaseConfig<S, R>()
+class DragAndDropLocalConfig<S : DragAssignment, R : DragAssignment> : BaseConfig<S, R>()
 
 
 /**
  * User actions
  */
-public enum class UserAction {
+enum class UserAction {
     /**
      * Drag must be performed on user's touch action
      */

diff --git a/easydnd/src/main/java/ru/checka/easydnd/DragAndDropManager.kt b/easydnd/src/main/java/ru/checka/easydnd/DragAndDropManager.kt
@@ -43,15 +43,11 @@ class DragAndDropManager<S : DragAssignment, R : DragAssignment> {
         receivers.addAll(newReceivers)
         for (receiver in newReceivers) {
             for (sender in newSenders) {
-                receiverSenderMap.compute(receiver.assignedObject.tag) { _, v ->
-                    val senderTag = sender.assignedObject.tag
-                    v?.apply { add(senderTag) } ?: mutableSetOf(senderTag)
-                }
-//                val receiverTag = receiver.assignedObject.tag
-//                val senderTag = sender.assignedObject.tag
-//                var senders = receiverSenderMap[receiverTag]
-//                senders = senders?.apply { add(senderTag) } ?: mutableSetOf(senderTag)
-//                receiverSenderMap[receiverTag] = senders
+                val receiverTag = receiver.assignedObject.tag
+                val senderTag = sender.assignedObject.tag
+                receiverSenderMap
+                    .getOrPut(receiverTag, ::mutableSetOf)
+                    .add(senderTag)
             }
         }
         //save custom config
@@ -79,9 +75,10 @@ class DragAndDropManager<S : DragAssignment, R : DragAssignment> {
     private fun checkSenderReceiver(sender: DragAndDropObject<S>?, receiver: DragAndDropObject<R>?): Boolean {
         if (sender == null || receiver == null)
             return false
-        val set = receiverSenderMap[receiver.assignedObject.tag]
         if (defaultConfig.selfDrop || sender.assignedObject.tag != receiver.assignedObject.tag) {
-            return set != null && set.contains(sender.assignedObject.tag)
+            return receiverSenderMap[receiver.assignedObject.tag]
+                ?.contains(sender.assignedObject.tag)
+                ?: false
         }
         return false
     }
@@ -112,6 +109,7 @@ class DragAndDropManager<S : DragAssignment, R : DragAssignment> {
                     }
 
                 }
+
                 DragEvent.ACTION_DRAG_EXITED -> {
                     val sender = senders.find { event.clipDescription.label == it.assignedObject.tag }
                     val receiver = receivers.find { view.tag == it.assignedObject.tag }
@@ -157,7 +155,11 @@ class DragAndDropManager<S : DragAssignment, R : DragAssignment> {
         val action: (View, S) -> Boolean = { view, obj ->
             val item = ClipData.Item("DragAndDrop" as CharSequence)
             val dragData = ClipData(obj.tag, arrayOf(ClipDescription.MIMETYPE_TEXT_PLAIN), item)
-            view.startDragAndDrop(dragData, sbBuilder(view, obj), null, dragFlags)
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+                view.startDragAndDrop(dragData, sbBuilder(view, obj), null, dragFlags)
+            } else {
+                view.startDrag(dragData, sbBuilder(view, obj), null, dragFlags)
+            }
             true
 
         }