feat: add android support for shouldDismissByDrag

Author: 4cc3ssX

README.md

@@ -154,7 +154,7 @@ alert({
 | `preset`              |  string  |    `done`     |  ![Both]   |  ✅   |  ✅   | `done, error, none, spinner`                 |
 | `duration`            |  number  |      `3`      |  ![Both]   |  ✅   |  ✅   | The lifetime of the toast (seconds)                                                         |
 | `titleColor`          |  string  |     null      |  ![Both]   |  ✅   |  ✅   |                                                                                             |
-| `shouldDismissByDrag` | boolean  |     true      |  ![Both]   |  ✅   |       | The behavior on `Android` is click                                                          |
+| `shouldDismissByDrag` | boolean  |     true      |  ![Both]   |  ✅   |
 | `position`            |  string  |     `top`     |  ![Both]   |  ✅   |       | **Toast** is displayed from `top` or `bottom`                                               |
 | `haptic`              |  string  |     null      |   ![iOS]   |  ✅   |       | `success, warning, error, none`                                                             |
 | `shouldDismissByTap`  | boolean  |     true      |  ![Both]   |       |  ✅   |                                                                                             |
@@ -178,7 +178,7 @@ alert({
 - [x] `backgroundColor` (v.1.0.3)
 - [x] `spinner preset for toast` (v.1.1.0)
 - [x] custom color like StyleSheet (e.g. `#fff`, `red`, `rgba(0, 0, 0, .8)`)
-- [ ] `shouldDismissByDrag` on **Android**
+- [x] `shouldDismissByDrag` on **Android**
 - [ ] `callback`
 
 

android/src/main/java/com/ting/TingModule.kt

@@ -11,8 +11,11 @@ import android.graphics.drawable.AnimatedVectorDrawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Handler
 import android.os.Looper
+import android.view.GestureDetector
 import android.view.Gravity
 import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ProgressBar
@@ -26,6 +29,7 @@ import com.facebook.react.bridge.WritableMap
 import com.hjq.window.EasyWindow
 import java.io.IOException
 import java.net.URL
+import kotlin.math.abs
 import kotlin.math.roundToInt
 
 
@@ -38,9 +42,9 @@ class TingModule internal constructor(context: ReactApplicationContext) : TingSp
   private var alertOptionInit: ReadableMap? = null
 
   @ReactMethod
-  override fun toast(options: ReadableMap) {
+  override fun toast(rnOptions: ReadableMap) {
     // get container View
-    val options = toastOptionInit?.let { mergeMaps(it, options) } ?: options
+    val options = toastOptionInit?.let { mergeMaps(it, rnOptions) } ?: rnOptions
 
     val container = getContainerView(R.layout.toast, options, "toast")
     val duration: Int = getDuration(options)
@@ -66,19 +70,46 @@ class TingModule internal constructor(context: ReactApplicationContext) : TingSp
         setYOffset(48)
         setAnimStyle(toastAnim)
         setOutsideTouchable(true)
-        setOnClickListener(R.id.toast,
-          EasyWindow.OnClickListener { toast: EasyWindow<*>, _: LinearLayout? ->
-            val shouldDismissByTap =
-              if (options.hasKey("shouldDismissByDrag")) options.getBoolean("shouldDismissByDrag") else true
-            if (shouldDismissByTap) toast.cancel()
-          })
+
+        if (options.hasKey("shouldDismissByDrag") && options.getBoolean("shouldDismissByDrag")) {
+          // Define dragThreshold in density-independent pixels (dp)
+          val dragThresholdDP = 12
+          val scale = context.resources.displayMetrics.density
+          val dragThreshold = (dragThresholdDP * scale + 0.5f).toInt()
+
+          // Add drag gesture recognizer
+          contentView?.let { contentView ->
+            val gestureDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
+              override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+                // Check if the user scrolls vertically and dismiss the toast window if needed
+                if (abs(distanceY) > abs(distanceX)) {
+                  if (position == Gravity.TOP && distanceY > dragThreshold) { // Dismiss upward if toast is at the top
+                    toastWindow.cancel()
+                    return true
+                  } else if (position == Gravity.BOTTOM && distanceY < -dragThreshold) { // Dismiss downward if toast is at the bottom
+                    toastWindow.cancel()
+                    return true
+                  }
+                }
+
+                return super.onScroll(e1, e2, distanceX, distanceY)
+              }
+            })
+
+            contentView.setOnTouchListener(fun(_: View, event: MotionEvent): Boolean {
+              gestureDetector.onTouchEvent(event)
+              return true // Consume the touch event
+            })
+          }
+        }
+
       }.show()
     }
   }
 
   @ReactMethod
-  override fun alert(options: ReadableMap) {
-    val options = alertOptionInit?.let { mergeMaps(it, options) } ?: options
+  override fun alert(rnOptions: ReadableMap) {
+    val options = alertOptionInit?.let { mergeMaps(it, rnOptions) } ?: rnOptions
 
     val container = getContainerView(R.layout.alert, options, "alert")
     val duration: Int = getDuration(options)

example/src/App.tsx

@@ -160,7 +160,6 @@ const DATA: ItemType[] = [
     onPress: () =>
       toast({
         duration: 10,
-
         title: 'Việt Nam',
         titleColor: '#ffffff',
         message: 'Vietnamese Gangz 🇻🇳',
@@ -195,6 +194,7 @@ const DATA: ItemType[] = [
         message: 'Chờ xíu',
         preset: 'spinner',
         progressColor: '#FD966A',
+        shouldDismissByDrag: true,
       }),
   },
   {