detox 20.20.2 → 20.21.0

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0-sources.jar.md5

@@ -0,0 +1 @@
+3387de0925b210d074f132cf01ac3de0

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0-sources.jar.sha1

@@ -0,0 +1 @@
+559b5fbefe99b614d2a1dd80e0ad47f06ffc5408

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0-sources.jar.sha256

@@ -0,0 +1 @@
+c3b9ef703b247428ada96d85eacf933c8c2b7d274335c75f9d4d32dd25028e9d

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0-sources.jar.sha512

@@ -0,0 +1 @@
+492d5dbb4ffc6c504fcc121021595d03221c7ede4d2ef61bc5c959df19968d732baf6940a2b839a551a52b65ef721c08e7b9f4028d4b90808b224a8d80bbc984

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0.aar.md5

@@ -0,0 +1 @@
+31bc3655525c5e1de60651828dbe4b23

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0.aar.sha1

@@ -0,0 +1 @@
+05e3d3c1fb1dfe0ef619885bd89f3e23ad265c14

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0.aar.sha256

@@ -0,0 +1 @@
+4c664be552f9844c390dcf9843c16195ee71ae5fac82340fc2fa26d7f98f97da

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0.aar.sha512

@@ -0,0 +1 @@
+b9a385a9b94cf5b0bec34751c9c7e03fd7cd8f6f094beac31df31bed89dbe93895289e45a08cf230a9806c71786ae74c75e8f58f3f57814624af8fa28e6b76d6

package/Detox-android/com/wix/detox/{20.20.2/detox-20.20.2.pom → 20.21.0/detox-20.21.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>20.20.2</version>
+  <version>20.21.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0.pom.md5

@@ -0,0 +1 @@
+05807a16588292d8975405f31295b594

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0.pom.sha1

@@ -0,0 +1 @@
+f0ad65330c51d3a57e1e381edc64ddd7f10d5d11

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0.pom.sha256

@@ -0,0 +1 @@
+720b6a69502a1047d143f23b5db0793c965f04f1d6fccd04b3472f64eac38d67

package/Detox-android/com/wix/detox/20.21.0/detox-20.21.0.pom.sha512

@@ -0,0 +1 @@
+4857f694c3a4ba4c0a0e3a14e78906032687be8062d9630b658bbd7bedd3fb1098a989f86b11f7fc00ffad1b9927ff2dbaf48dfd74818f5e1c08ed9d26a267a5

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <latest>20.20.2</latest>
-    <release>20.20.2</release>
+    <latest>20.21.0</latest>
+    <release>20.21.0</release>
     <versions>
-      <version>20.20.2</version>
+      <version>20.21.0</version>
     </versions>
-    <lastUpdated>20240413085537</lastUpdated>
+    <lastUpdated>20240513104458</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-b134664763a162e01d64004a8608d797
+ee4539794be82f984845b866ce47d797

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-3bcc241bab8016602b4b8b17712e202423625e9d
+047da11f8d7764ce83a44415f5ca14150b0d26e8

package/Detox-android/com/wix/detox/maven-metadata.xml.sha256

@@ -1 +1 @@
-9dd3c8a8de9979cbe9b7a05d40f67eab21ff57ff02c0402cbe19e9a6bbdfb943
+aa8c3fb9036b5f238114a0cc799621647355991b7b8d2d45653a4f283d2a1426

package/Detox-android/com/wix/detox/maven-metadata.xml.sha512

@@ -1 +1 @@
-0ffda11da4e0d1d79df1bfd756c6707fae5b0b863089cd9c9a8568f938a649e2ee1b70641bb8c49478ab3508964fdc057390cdbfd16ab7352a320ce0339831c3
+749a441df252d5a784d527cfb9e9179724c3bdfc95f10f40c305a7e260f717a63813b933921861a8593f61ea548f70bf7f9f8f4a5c19aaa1cd3b3480b081fc8e

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0-sources.jar.md5

@@ -0,0 +1 @@
+f297dccee1b070c04339c6d3a44aaf98

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0-sources.jar.sha1

@@ -0,0 +1 @@
+67a54cce54b41b23776bb74111f65aa2690445c1

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0-sources.jar.sha256

@@ -0,0 +1 @@
+54663486b8606482cc50334d106f99584d8ed62a030a7599d3a74328606e2175

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0-sources.jar.sha512

@@ -0,0 +1 @@
+79ac3563b92cd6ac25acc93885c0e866a2f1190d08988499261cfdf247f5fa4c5f8d3f5aa297f8682e822fdf751f89196fe4e0556d7328a40b39f7079179cddb

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0.aar.md5

@@ -0,0 +1 @@
+f35c1d0b6e6002973dc3a27dcd693666

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0.aar.sha1

@@ -0,0 +1 @@
+95b13b9d33524b8c704258c314a3e21572086d45

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0.aar.sha256

@@ -0,0 +1 @@
+a40f50e7629a8076af5698aa1a533523ea1bc53782240ff01be641911d8865b2

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0.aar.sha512

@@ -0,0 +1 @@
+c3c9d8eca84ce4da0e1a75a7364ec0a8df8fd1b910db22769b719d4c222fbb726ba973a41c35eeab77db3603c87a31d8b85bb71cd6c5d25bdb36d48f72733fa4

package/Detox-android/com/wix/detox-legacy/{20.20.2/detox-legacy-20.20.2.pom → 20.21.0/detox-legacy-20.21.0.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox-legacy</artifactId>
-  <version>20.20.2</version>
+  <version>20.21.0</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0.pom.md5

@@ -0,0 +1 @@
+16fb38e9f0b98073b38adbc235fe3be4

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0.pom.sha1

@@ -0,0 +1 @@
+043d16e8f617a51b47e9f9f53f96acd4a7bd5958

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0.pom.sha256

@@ -0,0 +1 @@
+a31050af14f97ee5232e932d0ff9c7e6f7703b6eb07c528da9c86ddc6b9e7670

package/Detox-android/com/wix/detox-legacy/20.21.0/detox-legacy-20.21.0.pom.sha512

@@ -0,0 +1 @@
+037112076433da9365a46eeffd53e9556da255f081a7af4b781b902d9f52508242d0a9d8bb1e5f6a64ad2e243bdb54cab48c301b1c3e39853dde2ed0c1deffe1

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.wix</groupId>
   <artifactId>detox-legacy</artifactId>
   <versioning>
-    <latest>20.20.2</latest>
-    <release>20.20.2</release>
+    <latest>20.21.0</latest>
+    <release>20.21.0</release>
     <versions>
-      <version>20.20.2</version>
+      <version>20.21.0</version>
     </versions>
-    <lastUpdated>20240413085703</lastUpdated>
+    <lastUpdated>20240513104609</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.md5

@@ -1 +1 @@
-cff8b68da66e7bcfd7ba77d71e03a5e2
+d545ee1d9b3d980031a6d7f23ae6622e

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha1

@@ -1 +1 @@
-7dbc9b7569e8af9e77ffb115a24cb32ec21136be
+bf54a3a7dc2ac2d25d618a4c0426024abbec7163

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha256

@@ -1 +1 @@
-b7b643569d4382cfa7960e967a3ff2d99098baceb0174b1c5e63b4a4be045fe4
+d4d8c6d7ec27c61a5846b9cfe99277edaf6fa785c41e33ac1b5fc91d263696a1

package/Detox-android/com/wix/detox-legacy/maven-metadata.xml.sha512

@@ -1 +1 @@
-8f1f9f5adc530f4a2c04e3faa269ff3c0e20da8d802e92c49f01c9e0dc2d0fe87c8f6996d1f9af655653054dbf40dc171f409e2a8e2332de0816cdfac6c5d15b
+6b6bff10ef38514b6e3c3898837a22e219ca01d19f77e98b95cc317ec857713435d0392e5a49147b9db41397f6cf7f7cabc006b5bf641d341e144288291a19a7

package/android/detox/src/coreNative/java/com/wix/detox/actions/DetoxViewActions.kt

@@ -9,14 +9,14 @@ import com.wix.detox.action.common.MOTION_DIR_DOWN
 import com.wix.detox.action.common.MOTION_DIR_LEFT
 import com.wix.detox.action.common.MOTION_DIR_RIGHT
 import com.wix.detox.action.common.MOTION_DIR_UP
-import com.wix.detox.espresso.action.DetoxMultiTap
+import com.wix.detox.espresso.action.DetoxCustomTapper
 import com.wix.detox.espresso.scroll.DetoxScrollAction
 
 public object DetoxViewActions {
     public fun tap() = multiTap(1)
     public fun doubleTap() = multiTap(2)
     public fun multiTap(times: Int): ViewAction =
-        actionWithAssertions(GeneralClickAction(DetoxMultiTap(times), GeneralLocation.CENTER, Press.FINGER, 0, 0))
+        actionWithAssertions(GeneralClickAction(DetoxCustomTapper(times), GeneralLocation.CENTER, Press.FINGER, 0, 0))
 
     public fun scrollUpBy(amountInDp: Double, startOffsetPercentX: Float? = null, startOffsetPercentY: Float? = null): ViewAction =
         actionWithAssertions(DetoxScrollAction(MOTION_DIR_UP, amountInDp, startOffsetPercentX, startOffsetPercentY))

package/android/detox/src/full/java/com/wix/detox/espresso/DetoxAction.java

@@ -20,7 +20,7 @@ import com.wix.detox.action.common.MotionDir;
 import com.wix.detox.common.DetoxErrors.DetoxRuntimeException;
 import com.wix.detox.common.DetoxErrors.StaleActionException;
 import com.wix.detox.espresso.action.AdjustSliderToPositionAction;
-import com.wix.detox.espresso.action.DetoxMultiTap;
+import com.wix.detox.espresso.action.DetoxCustomTapper;
 import com.wix.detox.espresso.action.GetAttributesAction;
 import com.wix.detox.espresso.action.LongPressAndDragAction;
 import com.wix.detox.espresso.action.RNClickAction;
@@ -29,6 +29,7 @@ import com.wix.detox.espresso.action.ScreenshotResult;
 import com.wix.detox.espresso.action.ScrollToIndexAction;
 import com.wix.detox.espresso.action.TakeViewScreenshotAction;
 import com.wix.detox.espresso.action.common.utils.ViewInteractionExt;
+import com.wix.detox.espresso.action.common.DetoxViewConfigurations;
 import com.wix.detox.espresso.scroll.DetoxScrollAction;
 import com.wix.detox.espresso.scroll.DetoxScrollActionStaleAtEdge;
 import com.wix.detox.espresso.scroll.ScrollEdgeException;
@@ -42,7 +43,6 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
-
 /**
  * Created by simonracz on 10/07/2017.
  */
@@ -57,24 +57,29 @@ public class DetoxAction {
     }
 
     public static ViewAction multiClick(int times) {
-        return actionWithAssertions(new GeneralClickAction(new DetoxMultiTap(times), GeneralLocation.CENTER, Press.FINGER, 0, 0));
+        return actionWithAssertions(new GeneralClickAction(new DetoxCustomTapper(times), GeneralLocation.CENTER, Press.FINGER, 0, 0));
     }
 
     public static ViewAction tapAtLocation(final int x, final int y) {
+        CoordinatesProvider coordinatesProvider = createCoordinatesProvider(x, y);
+        return actionWithAssertions(new RNClickAction(coordinatesProvider));
+    }
+
+    private static CoordinatesProvider createCoordinatesProvider(final int x, final int y) {
         final int px = DeviceDisplay.convertDpiToPx(x);
         final int py = DeviceDisplay.convertDpiToPx(y);
-        CoordinatesProvider c = new CoordinatesProvider() {
-            @Override
-            public float[] calculateCoordinates(View view) {
-                final int[] xy = new int[2];
-                view.getLocationOnScreen(xy);
-                final float fx = xy[0] + px;
-                final float fy = xy[1] + py;
-                return new float[]{fx, fy};
-            }
-        };
-        return actionWithAssertions(new RNClickAction(c));
-    }
+
+        return new CoordinatesProvider() {
+             @Override
+             public float[] calculateCoordinates(View view) {
+                 final int[] xy = new int[2];
+                 view.getLocationOnScreen(xy);
+                 final float fx = xy[0] + px;
+                 final float fy = xy[1] + py;
+                 return new float[]{fx, fy};
+             }
+         };
+     };
 
     /**
      * Scrolls to the edge of the given scrollable view.
@@ -208,6 +213,25 @@ public class DetoxAction {
         ));
     }
 
+    public static ViewAction longPress() {
+        return longPress(null, null, null);
+    }
+
+    public static ViewAction longPress(Integer duration) {
+        return longPress(null, null, duration);
+    }
+
+    public static ViewAction longPress(Integer x, Integer y) {
+        return longPress(x, y, null);
+    }
+
+    public static ViewAction longPress(Integer x, Integer y, Integer duration) {
+        Long finalDuration = duration != null ? duration : DetoxViewConfigurations.getLongPressTimeout();
+        CoordinatesProvider coordinatesProvider = x == null || y == null ? null : createCoordinatesProvider(x, y);
+
+        return actionWithAssertions(new RNClickAction(coordinatesProvider, finalDuration));
+    }
+
     public static ViewAction takeViewScreenshot() {
         return new ViewActionWithResult<String>() {
             private final TakeViewScreenshotAction action = new TakeViewScreenshotAction();

package/android/detox/src/full/java/com/wix/detox/espresso/action/RNClickAction.java

@@ -21,21 +21,23 @@ public class RNClickAction implements ViewAction {
     private final GeneralClickAction clickAction;
 
     public RNClickAction() {
-        clickAction = new GeneralClickAction(
-                        new DetoxSingleTap(),
-                        GeneralLocation.VISIBLE_CENTER,
-                        Press.FINGER,
-                        InputDevice.SOURCE_UNKNOWN,
-                        MotionEvent.BUTTON_PRIMARY);
+        this(null, null);
     }
 
     public RNClickAction(CoordinatesProvider coordinatesProvider) {
+        this(coordinatesProvider, null);
+    }
+
+    public RNClickAction(CoordinatesProvider coordinatesProvider, Long duration) {
+        coordinatesProvider = coordinatesProvider != null ? coordinatesProvider : GeneralLocation.VISIBLE_CENTER;
+
         clickAction = new GeneralClickAction(
-                        new DetoxSingleTap(),
-                        coordinatesProvider,
-                        Press.FINGER,
-                        InputDevice.SOURCE_UNKNOWN,
-                        MotionEvent.BUTTON_PRIMARY);
+            new DetoxSingleTap(duration),
+            coordinatesProvider,
+            Press.FINGER,
+            InputDevice.SOURCE_UNKNOWN,
+            MotionEvent.BUTTON_PRIMARY
+        );
     }
 
     @Override

package/android/detox/src/full/java/com/wix/detox/reactnative/ReactMarkersLogger.kt

@@ -8,7 +8,9 @@ import com.facebook.react.bridge.ReactMarkerConstants.*
 object ReactMarkersLogger : ReactMarker.MarkerListener {
 
     fun attach() {
-        ReactMarker.addListener(this)
+        if (ReactNativeInfo.rnVersion().minor >= 71) {
+            ReactMarker.addListener(this)
+        }
     }
 
     override fun logMarker(marker: ReactMarkerConstants, p1: String?, p2: Int) {

package/android/detox/src/main/java/com/wix/detox/espresso/action/{DetoxMultiTap.kt → DetoxCustomTapper.kt}

@@ -29,7 +29,7 @@ import com.wix.detox.espresso.action.common.TapEvents
  *
  * This should be Espresso's default implementation IMO.
  */
-open class DetoxMultiTap
+open class DetoxCustomTapper
     @JvmOverloads constructor(
             private val times: Int,
             private val interTapsDelayMs: Long = getDoubleTapMinTime(),
@@ -37,8 +37,9 @@ open class DetoxMultiTap
             private val longTapMinTimeMs: Long = getLongTapMinTime(),
             private val tapEvents: TapEvents = TapEvents(),
             private val uiControllerCallSpy: UiControllerSpy = UiControllerSpy.instance,
-            private val log: DetoxLog = DetoxLog.instance)
-    : Tapper {
+            private val log: DetoxLog = DetoxLog.instance,
+            private val duration: Long? = null
+    ) : Tapper {
 
     override fun sendTap(uiController: UiController?, coordinates: FloatArray?, precision: FloatArray?)
             = sendTap(uiController, coordinates, precision, 0, 0)
@@ -69,11 +70,12 @@ open class DetoxMultiTap
         var downTimestamp: Long? = null
 
         for (i in 1..times) {
-            val tapEvents = tapEvents.createEventsSeq(coordinates, precision, downTimestamp)
+            val tapEvents = tapEvents.createEventsSeq(coordinates, precision, downTimestamp, duration)
             eventSequence.addAll(tapEvents)
 
             downTimestamp = tapEvents.last().eventTime + interTapsDelayMs
         }
+
         return eventSequence
     }
 
@@ -104,8 +106,8 @@ open class DetoxMultiTap
 
     private fun verifyTapEventTimes(upEvent: CallInfo, downEvent: CallInfo) {
         val delta: Long = (upEvent - downEvent)!!
-        if (delta >= longTapMinTimeMs) {
+        if (delta >= longTapMinTimeMs && duration == null) {
             log.warn(LOG_TAG, "Tap handled too slowly, and turned into a long-tap!") // TODO conditionally turn into an error, based on a global strict-mode detox config
         }
     }
-}
+}

package/android/detox/src/main/java/com/wix/detox/espresso/action/DetoxSingleTap.kt

@@ -1,3 +1,3 @@
 package com.wix.detox.espresso.action
 
-open class DetoxSingleTap : DetoxMultiTap(1)
+class DetoxSingleTap(duration: Long? = null) : DetoxCustomTapper(1, duration = duration)

package/android/detox/src/main/java/com/wix/detox/espresso/action/common/DetoxViewConfiguration.kt

@@ -9,6 +9,16 @@ private const val LOG_TAG = "Detox-ViewConfig"
 
 object DetoxViewConfigurations {
 
+    /**
+     * Duration before a press turns into a long press.
+     * Due to `Tap.LONG`, factor 1.5 is needed, otherwise a long press is not safely detected.
+     *
+     * @see androidx.test.espresso.action.Tap.LONG
+     * @see android.test.TouchUtils.longClickView
+     */
+    @JvmStatic
+    fun getLongPressTimeout(): Long = (ViewConfiguration.getLongPressTimeout() * 1.5).toLong()
+
     fun getPostTapCoolDownTime() = ViewConfiguration.getDoubleTapTimeout().toLong()
 
     /**

package/android/detox/src/main/java/com/wix/detox/espresso/action/common/TapEvents.kt

@@ -15,16 +15,24 @@ import android.view.MotionEvent
  * Lastly, With the case of _that_ specific bug, we implicitly indirectly work around it with this approach, because we highly increase
  * the chance of allowing a frame to be drawn in between the _down_ and _up_ events.
  */
-private const val EVENTS_TIME_GAP_MS = 30
+private const val EVENTS_TIME_GAP_MS = 30L
 
 class TapEvents(private val motionEvents: MotionEvents = MotionEvents()) {
     fun createEventsSeq(coordinates: FloatArray, precision: FloatArray)
-            = createEventsSeq(coordinates, precision, null)
+            = createEventsSeq(coordinates, precision, null, null)
 
-    fun createEventsSeq(coordinates: FloatArray, precision: FloatArray, downTimestamp: Long?): List<MotionEvent> {
+    fun createEventsSeq(
+        coordinates: FloatArray,
+        precision: FloatArray,
+        downTimestamp: Long?,
+        duration: Long?
+    ): List<MotionEvent> {
         val (x, y) = coordinates
         val downEvent = motionEvents.obtainDownEvent(x, y, precision, downTimestamp)
-        val upEvent = motionEvents.obtainUpEvent(downEvent, downEvent.eventTime + EVENTS_TIME_GAP_MS, x, y)
+
+        val upEventDuration = duration ?: EVENTS_TIME_GAP_MS
+        val upEvent = motionEvents.obtainUpEvent(downEvent, downEvent.eventTime + upEventDuration, x, y)
+
         return arrayListOf(downEvent, upEvent)
     }
 }

package/android/detox/src/main/java/com/wix/detox/espresso/scroll/DetoxScrollActions.kt

@@ -20,7 +20,7 @@ abstract class DetoxScrollActionBase internal constructor(
     : ViewAction {
     override fun getConstraints(): Matcher<View> = allOf(isAssignableFrom(View::class.java), isDisplayed())
     override fun perform(uiController: UiController?, view: View?) =
-            ScrollHelper.perform(uiController, view, direction, amountInDp, startOffsetPercentX, startOffsetPercentY)
+        ScrollHelper.perform(uiController, view, direction, amountInDp, startOffsetPercentX, startOffsetPercentY)
 }
 
 class DetoxScrollAction(@MotionDir direction: Int, amountInDp: Double, startOffsetPercentX: Float?, startOffsetPercentY: Float?)
@@ -30,6 +30,8 @@ class DetoxScrollAction(@MotionDir direction: Int, amountInDp: Double, startOffs
     override fun perform(uiController: UiController?, view: View?) {
         try {
             super.perform(uiController, view)
+        } catch (e: ScrollEdgeException) {
+            // Hit the edge
         } catch (e: Exception) {
             throw DetoxRuntimeException(e)
         }

package/android/detox/src/main/java/com/wix/detox/espresso/scroll/DetoxSwipe.kt

@@ -1,7 +1,7 @@
 package com.wix.detox.espresso.scroll
 
 /**
- * Along with [FlinglessSwiper], this is based on from Espresso's implementation of Swiping
+ * Along with [LinearSwiper], this is based on from Espresso's implementation of Swiping
  * (i.e. in [androidx.test.espresso.action.Swipe] - typically dispatched via the
  * [androidx.test.espresso.action.GeneralSwipeAction] action class).
  *

package/android/detox/src/main/java/com/wix/detox/espresso/scroll/ScrollHelper.java

@@ -29,7 +29,7 @@ import static com.wix.detox.espresso.scroll.ScrollProbes.getScrollableProbe;
 public class ScrollHelper {
     private static final String LOG_TAG = "DetoxScrollHelper";
 
-    private static final int SCROLL_MOTIONS = 70;
+    private static final int SCROLL_MOTIONS = 40;
     private static final int MAX_FLING_WAITS = 3;
 
     private static final double DEFAULT_DEADZONE_PERCENT = 0.05;
@@ -95,7 +95,7 @@ public class ScrollHelper {
     }
 
     private static void doScroll(final Context context, final UiController uiController, int downX, int downY, int upX, int upY) {
-        final DetoxSwiper swiper = new FlinglessSwiper(SCROLL_MOTIONS, uiController, ViewConfiguration.get(context));
+        final DetoxSwiper swiper = new LinearSwiper(uiController);
         final DetoxSwipe swipe = new DetoxSwipe(downX, downY, upX, upY, SCROLL_MOTIONS, swiper);
         swipe.perform();
     }

package/android/detox/src/testFull/java/com/wix/detox/common/TapEventsSpec.kt

@@ -90,16 +90,28 @@ object TapEventsSpec: Spek({
             val precision = fancyPrecision()
             val downTimestamp = 10203040L
 
-            uut().createEventsSeq(coordinates, precision, downTimestamp)
+            uut().createEventsSeq(coordinates, precision, downTimestamp, null)
 
             verifyDownEventObtainedWithDownTimestamp(coordinates, precision, downTimestamp)
         }
 
-        it("should allow for down-time to be null") {
+        it("should allow for duration to be set") {
+            val duration = 1000L
+            val expectedUpEventTime = DEFAULT_EVENT_TIME + duration
             val coordinates = dontCareCoordinates()
             val precision = dontCarePrecision()
 
-            uut().createEventsSeq(coordinates, precision, downTimestamp = null as Long?)
+            uut().createEventsSeq(coordinates, precision, null, duration)
+
+            verifyDownEventObtainedWithDownTimestamp(coordinates, precision, null)
+            verifyUpEventObtainedWithTimestamp(expectedUpEventTime)
+        }
+
+        it("should allow for down-time and duration to be null") {
+            val coordinates = dontCareCoordinates()
+            val precision = dontCarePrecision()
+
+            uut().createEventsSeq(coordinates, precision, null, null)
 
             verifyDownEventObtainedWithDownTimestamp(coordinates, precision, null)
         }

package/android/detox/src/testFull/java/com/wix/detox/espresso/action/{DetoxMultiTapSpec.kt → DetoxCustomTapperSpec.kt}

@@ -14,8 +14,8 @@ import org.spekframework.spek2.style.specification.describe
 import java.lang.NullPointerException
 import kotlin.test.assertFailsWith
 
-object DetoxMultiTapSpec: Spek({
-    describe("Detox multi-tapper replacement for Espresso") {
+object DetoxCustomTapperSpec: Spek({
+    describe("Detox custom-tapper replacement for Espresso") {
 
         val coolDownTimeMs = 111L
         val interTapsDelayMs = 667L
@@ -41,8 +41,10 @@ object DetoxMultiTapSpec: Spek({
             mock1stTapEventsSeq = arrayListOf(downEvent, upEvent)
             mock2ndTapEventsSeq = arrayListOf(mock(name = "mockSeq2Event1"), mock(name = "mockSeq2Event2"))
             tapEvents = mock {
-                on { createEventsSeq(any(), any(), isNull()) }.doReturn(mock1stTapEventsSeq)
-                on { createEventsSeq(any(), any(), any()) }.doReturn(mock2ndTapEventsSeq)
+                on { createEventsSeq(any(), any(), isNull(), isNull()) }.doReturn(mock1stTapEventsSeq)
+                on { createEventsSeq(any(), any(), isNull(), any()) }.doReturn(mock1stTapEventsSeq)
+                on { createEventsSeq(any(), any(), any(), isNull()) }.doReturn(mock2ndTapEventsSeq)
+                on { createEventsSeq(any(), any(), any(), any()) }.doReturn(mock2ndTapEventsSeq)
             }
 
             uiControllerCallSpy = mock() {
@@ -52,9 +54,10 @@ object DetoxMultiTapSpec: Spek({
             log = mock()
         }
 
-        fun verify1stTapEventsSeqGenerated() = verify(tapEvents).createEventsSeq(coordinates, precision, null)
-        fun verify2ndTapEventsSeqGenerated() = verify(tapEvents).createEventsSeq(eq(coordinates), eq(precision), any())
-        fun verify2ndTapEventsGenerateWithTimestamp(downTimestamp: Long) = verify(tapEvents).createEventsSeq(any(), any(), eq(downTimestamp))
+        fun verify1stTapEventsSeqGenerated(duration: Long? = null) = verify(tapEvents).createEventsSeq(eq(coordinates), eq(precision), isNull(), eq(duration))
+        fun verify2ndTapEventsSeqGenerated() = verify(tapEvents).createEventsSeq(eq(coordinates), eq(precision), isNull(), isNull())
+        fun verify2ndTapEventsGenerateWithTimestamp(downTimestamp: Long) = verify(tapEvents).createEventsSeq(eq(coordinates), eq(precision), eq(downTimestamp), isNull())
+
         fun verifyAllTapEventsInjected() = verify(uiController).injectMotionEventSequence(arrayListOf(mock1stTapEventsSeq, mock2ndTapEventsSeq).flatten())
         fun verifyMainThreadSynced() = verify(uiController).loopMainThreadForAtLeast(eq(coolDownTimeMs))
         fun verifyMainThreadNeverSynced() = verify(uiController, never()).loopMainThreadForAtLeast(any())
@@ -64,17 +67,24 @@ object DetoxMultiTapSpec: Spek({
         fun givenInjectionError() = whenever(uiController.injectMotionEventSequence(any())).doThrow(RuntimeException("exceptionMock"))
 
         fun givenInjectionCallsHistory(injectionsHistory: List<CallInfo?>) =
-                whenever(uiControllerCallSpy.eventInjectionsIterator()).thenReturn(injectionsHistory.iterator())
+            whenever(uiControllerCallSpy.eventInjectionsIterator()).thenReturn(injectionsHistory.iterator())
+
+        fun uut(times: Int, duration: Long? = null) =
+            DetoxCustomTapper(times, interTapsDelayMs, coolDownTimeMs, longTapMinTimeMs, tapEvents, uiControllerCallSpy, log, duration)
 
-        fun uut(times: Int) = DetoxMultiTap(times, interTapsDelayMs, coolDownTimeMs, longTapMinTimeMs, tapEvents, uiControllerCallSpy, log)
-        fun sendOneTap(uut: DetoxMultiTap = uut(1)) = uut.sendTap(uiController, coordinates, precision, -1, -1)
-        fun sendTwoTaps(uut: DetoxMultiTap = uut(2)) = uut.sendTap(uiController, coordinates, precision, -1, -1)
+        fun sendOneTap(duration: Long? = null) = uut(1, duration).sendTap(uiController, coordinates, precision, -1, -1)
+        fun sendTwoTaps(uut: DetoxCustomTapper = uut(2)) = uut.sendTap(uiController, coordinates, precision, -1, -1)
 
         it("should generate a single-tap events sequence using tap-events helper") {
             sendOneTap()
             verify1stTapEventsSeqGenerated()
         }
 
+        it("should generate a single-tap events sequence with a custom duration") {
+            sendOneTap(1000L)
+            verify1stTapEventsSeqGenerated(1000L)
+        }
+
         it("should generate multiple sets of single-tap event sequences using tap-events helper") {
             sendTwoTaps()
             verify1stTapEventsSeqGenerated()