From a208592fb8129112c98a73ec7d2980061899b8df Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Sun, 28 Jul 2024 15:24:25 +0300
Subject: [PATCH 01/11] add tap android and basic test

---
 detox/detox.d.ts                               |  7 +++++++
 detox/src/devices/runtime/RuntimeDevice.js     |  4 ++++
 .../src/devices/runtime/RuntimeDevice.test.js  |  7 +++++++
 .../runtime/drivers/DeviceDriverBase.js        |  4 ++++
 .../runtime/drivers/android/AndroidDriver.js   |  4 ++++
 detox/test/e2e/06.device.test.js               |  7 +++++++
 detox/test/src/Screens/DeviceTapScreen.tsx     | 18 ++++++++++++++++++
 detox/test/src/Screens/index.js                |  2 ++
 detox/test/src/app.js                          |  1 +
 9 files changed, 54 insertions(+)
 create mode 100644 detox/test/src/Screens/DeviceTapScreen.tsx

diff --git a/detox/detox.d.ts b/detox/detox.d.ts
index f22d5baba8..228f862db9 100644
--- a/detox/detox.d.ts
+++ b/detox/detox.d.ts
@@ -781,6 +781,13 @@ declare global {
              */
             setOrientation(orientation: Orientation): Promise<void>;
 
+            
+            /**
+             * Perform a click at arbitrary coordinates on the default display specified by the user. Currently only available in the Android Simulator.
+             */
+            tap(point?: Point2D): Promise<void>;
+
+
             /**
              * Sets the simulator/emulator location to the given latitude and longitude.
              *
diff --git a/detox/src/devices/runtime/RuntimeDevice.js b/detox/src/devices/runtime/RuntimeDevice.js
index 8d7f07f55d..c8cb5e93f0 100644
--- a/detox/src/devices/runtime/RuntimeDevice.js
+++ b/detox/src/devices/runtime/RuntimeDevice.js
@@ -278,6 +278,10 @@ class RuntimeDevice {
     await this.deviceDriver.setOrientation(orientation);
   }
 
+  async tap(point) {
+    await this.deviceDriver.tap(point);
+  }
+
   async setLocation(lat, lon) {
     lat = String(lat);
     lon = String(lon);
diff --git a/detox/src/devices/runtime/RuntimeDevice.test.js b/detox/src/devices/runtime/RuntimeDevice.test.js
index f32bcb5772..62852ea28d 100644
--- a/detox/src/devices/runtime/RuntimeDevice.test.js
+++ b/detox/src/devices/runtime/RuntimeDevice.test.js
@@ -816,6 +816,13 @@ describe('Device', () => {
     expect(driverMock.driver.setOrientation).toHaveBeenCalledWith('param');
   });
 
+  it(`tap() should pass to device driver`, async () => {
+    const device = await aValidDevice();
+    await device.tap('param');
+
+    expect(driverMock.driver.tap).toHaveBeenCalledWith('param');
+  });
+
   it(`sendUserNotification() should pass to device driver`, async () => {
     const device = await aValidDevice();
     await device.sendUserNotification('notif');
diff --git a/detox/src/devices/runtime/drivers/DeviceDriverBase.js b/detox/src/devices/runtime/drivers/DeviceDriverBase.js
index c38765aab4..658ab515b3 100644
--- a/detox/src/devices/runtime/drivers/DeviceDriverBase.js
+++ b/detox/src/devices/runtime/drivers/DeviceDriverBase.js
@@ -51,6 +51,10 @@ class DeviceDriverBase {
     return '';
   }
 
+  async tap(point) {
+    return '';
+  }
+
   async sendToHome() {
     return '';
   }
diff --git a/detox/src/devices/runtime/drivers/android/AndroidDriver.js b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
index 7f0f2cbc30..00d437f428 100644
--- a/detox/src/devices/runtime/drivers/android/AndroidDriver.js
+++ b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
@@ -245,6 +245,10 @@ class AndroidDriver extends DeviceDriverBase {
     await this.invocationManager.execute(call);
   }
 
+  async tap(point) {
+    await this.uiDevice.click(point.x, point.y);
+  }
+
   _getAppInstallPaths(_appBinaryPath, _testBinaryPath) {
     const appBinaryPath = getAbsoluteBinaryPath(_appBinaryPath);
     const testBinaryPath = _testBinaryPath ? getAbsoluteBinaryPath(_testBinaryPath) : this._getTestApkPath(appBinaryPath);
diff --git a/detox/test/e2e/06.device.test.js b/detox/test/e2e/06.device.test.js
index 2aa42d88ec..f2a5ab6276 100644
--- a/detox/test/e2e/06.device.test.js
+++ b/detox/test/e2e/06.device.test.js
@@ -84,4 +84,11 @@ describe('Device', () => {
     await device.pressBack();
     await expect(element(by.text('Back pressed !'))).toBeVisible();
   });
+
+  it.only(':android: tap on screen', async () => {
+    await element(by.text('Device Tap')).tap();
+    const point = {x: 200, y: 200}
+    await device.tap(point);
+    await expect(element(by.text('Screen Tapped'))).toBeVisible();
+  });
 });
diff --git a/detox/test/src/Screens/DeviceTapScreen.tsx b/detox/test/src/Screens/DeviceTapScreen.tsx
new file mode 100644
index 0000000000..0fdf6b18d4
--- /dev/null
+++ b/detox/test/src/Screens/DeviceTapScreen.tsx
@@ -0,0 +1,18 @@
+import React, {useCallback, useState} from 'react';
+import {Text, TouchableOpacity} from 'react-native';
+
+const DeviceTapScreen = () => {
+  const [shouldShowText, setShouldShowText] = useState(false);
+
+  const onPressButton = useCallback(() => {
+    setShouldShowText(true);
+  }, [setShouldShowText]);
+
+  return (
+    <TouchableOpacity onPress={onPressButton} style={{flex: 1}}>
+      {shouldShowText && <Text>{'Screen Tapped'}</Text>}
+    </TouchableOpacity>
+  );
+};
+
+export default DeviceTapScreen;
diff --git a/detox/test/src/Screens/index.js b/detox/test/src/Screens/index.js
index 64c60e82ff..83bcaefde1 100644
--- a/detox/test/src/Screens/index.js
+++ b/detox/test/src/Screens/index.js
@@ -22,6 +22,7 @@ import LaunchArgsScreen from './LaunchArgsScreen';
 import LaunchNotificationScreen from './LaunchNotificationScreen';
 import PickerViewScreen from './PickerViewScreen';
 import DeviceScreen from './DeviceScreen';
+import DeviceTapScreen from './DeviceTapScreen';
 import OverlayScreen from './OverlayScreen';
 import ElementScreenshotScreen from './ElementScreenshotScreen';
 import VirtualizedListStressScreen from './VirtualizedListStressScreen';
@@ -58,6 +59,7 @@ export {
   LaunchArgsScreen,
   LaunchNotificationScreen,
   DeviceScreen,
+  DeviceTapScreen,
   OverlayScreen,
   ElementScreenshotScreen,
   WebViewScreen,
diff --git a/detox/test/src/app.js b/detox/test/src/app.js
index cbb778894d..1ec9f3a61a 100644
--- a/detox/test/src/app.js
+++ b/detox/test/src/app.js
@@ -90,6 +90,7 @@ export default class example extends Component {
         {this.renderScreenButton('Network', Screens.NetworkScreen)}
         {this.renderAnimationScreenButtons()}
         {this.renderScreenButton('Device', Screens.DeviceScreen)}
+        {this.renderScreenButton('Device Tap', Screens.DeviceTapScreen)}
         {isIos && this.renderScreenButton('Overlay', Screens.OverlayScreen)}
         {this.renderScreenButton('Location', Screens.LocationScreen)}
         {this.renderScreenButton('DatePicker', Screens.DatePickerScreen)}

From 2114892e93a40b4271c83b4415988dd518016161 Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Mon, 29 Jul 2024 10:17:39 +0300
Subject: [PATCH 02/11] update tests

---
 detox/detox.d.ts                              |  2 --
 .../runtime/drivers/android/AndroidDriver.js  |  4 +++-
 detox/test/e2e/06.device.test.js              |  8 ++++++-
 detox/test/src/Screens/DeviceTapScreen.tsx    | 23 +++++++++++++------
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/detox/detox.d.ts b/detox/detox.d.ts
index 228f862db9..c1110e417c 100644
--- a/detox/detox.d.ts
+++ b/detox/detox.d.ts
@@ -781,13 +781,11 @@ declare global {
              */
             setOrientation(orientation: Orientation): Promise<void>;
 
-            
             /**
              * Perform a click at arbitrary coordinates on the default display specified by the user. Currently only available in the Android Simulator.
              */
             tap(point?: Point2D): Promise<void>;
 
-
             /**
              * Sets the simulator/emulator location to the given latitude and longitude.
              *
diff --git a/detox/src/devices/runtime/drivers/android/AndroidDriver.js b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
index 00d437f428..f57c06ff88 100644
--- a/detox/src/devices/runtime/drivers/android/AndroidDriver.js
+++ b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
@@ -246,7 +246,9 @@ class AndroidDriver extends DeviceDriverBase {
   }
 
   async tap(point) {
-    await this.uiDevice.click(point.x, point.y);
+    let x = point?.x || await this.uiDevice.getDisplayWidth() / 2;
+    let y = point?.y || await this.uiDevice.getDisplayHeight() / 2;
+    await this.uiDevice.click(x, y);
   }
 
   _getAppInstallPaths(_appBinaryPath, _testBinaryPath) {
diff --git a/detox/test/e2e/06.device.test.js b/detox/test/e2e/06.device.test.js
index f2a5ab6276..19258844dc 100644
--- a/detox/test/e2e/06.device.test.js
+++ b/detox/test/e2e/06.device.test.js
@@ -86,9 +86,15 @@ describe('Device', () => {
   });
 
   it.only(':android: tap on screen', async () => {
+    await element(by.text('Device Tap')).tap();
+    await device.tap();
+    await expect(element(by.text('Screen Tapped'))).toBeVisible();
+  });
+
+  it(':android: tap on screen by coordinates', async () => {
     await element(by.text('Device Tap')).tap();
     const point = {x: 200, y: 200}
     await device.tap(point);
-    await expect(element(by.text('Screen Tapped'))).toBeVisible();
+    await expect(element(by.text('Button Tapped'))).toBeVisible();
   });
 });
diff --git a/detox/test/src/Screens/DeviceTapScreen.tsx b/detox/test/src/Screens/DeviceTapScreen.tsx
index 0fdf6b18d4..1d258d1863 100644
--- a/detox/test/src/Screens/DeviceTapScreen.tsx
+++ b/detox/test/src/Screens/DeviceTapScreen.tsx
@@ -1,16 +1,25 @@
-import React, {useCallback, useState} from 'react';
-import {Text, TouchableOpacity} from 'react-native';
+import React, { useCallback, useState } from 'react';
+import { Button, Text, TouchableOpacity, View } from 'react-native';
 
 const DeviceTapScreen = () => {
-  const [shouldShowText, setShouldShowText] = useState(false);
+  const [shouldShowScreenText, setShouldShowScreenText] = useState(false);
+  const [shouldShowButtonText, setShouldShowButtonText] = useState(false);
+
+  const onPressScreen = useCallback(() => {
+    setShouldShowScreenText(true);
+  }, [setShouldShowScreenText]);
 
   const onPressButton = useCallback(() => {
-    setShouldShowText(true);
-  }, [setShouldShowText]);
+    setShouldShowButtonText(true);
+  }, [setShouldShowScreenText]);
 
   return (
-    <TouchableOpacity onPress={onPressButton} style={{flex: 1}}>
-      {shouldShowText && <Text>{'Screen Tapped'}</Text>}
+    <TouchableOpacity onPress={onPressScreen} style={{ flex: 1 }}>
+      <View style={{ left: 40, top: 25, position: 'absolute' }}>
+        <Button onPress={onPressButton} title="TAP ME" />
+      </View>
+      {shouldShowScreenText && <Text>{'Screen Tapped'}</Text>}
+      {shouldShowButtonText && <Text>{'Button Tapped'}</Text>}
     </TouchableOpacity>
   );
 };

From cc494b930d7af0d705f8efc2c90ca39293acdf20 Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Mon, 29 Jul 2024 10:26:09 +0300
Subject: [PATCH 03/11] remove only from test

---
 detox/test/e2e/06.device.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/detox/test/e2e/06.device.test.js b/detox/test/e2e/06.device.test.js
index 19258844dc..d75df3ebf9 100644
--- a/detox/test/e2e/06.device.test.js
+++ b/detox/test/e2e/06.device.test.js
@@ -85,7 +85,7 @@ describe('Device', () => {
     await expect(element(by.text('Back pressed !'))).toBeVisible();
   });
 
-  it.only(':android: tap on screen', async () => {
+  it(':android: tap on screen', async () => {
     await element(by.text('Device Tap')).tap();
     await device.tap();
     await expect(element(by.text('Screen Tapped'))).toBeVisible();

From cb93597496d87125752beb103b68354544adcb2f Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Tue, 30 Jul 2024 17:12:54 +0300
Subject: [PATCH 04/11] add long press api

---
 .../com/wix/detox/espresso/EspressoDetox.java | 65 +++++++++++++++++
 detox/detox.d.ts                              |  7 +-
 .../src/android/espressoapi/EspressoDetox.js  | 71 +++++++++++++++++++
 detox/src/devices/runtime/RuntimeDevice.js    |  4 ++
 .../src/devices/runtime/RuntimeDevice.test.js | 14 +++-
 .../runtime/drivers/android/AndroidDriver.js  | 14 +++-
 .../runtime/drivers/ios/SimulatorDriver.js    |  4 ++
 detox/test/e2e/06.device.test.js              | 20 +++++-
 detox/test/src/Screens/DeviceTapScreen.tsx    | 24 +++++--
 detox/test/src/app.js                         |  2 +-
 10 files changed, 213 insertions(+), 12 deletions(-)

diff --git a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
index d9cf3eb4cf..9a4dc3783b 100644
--- a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
+++ b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
@@ -6,6 +6,7 @@
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.pm.ActivityInfo;
+import android.os.Debug;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,6 +19,7 @@
 import org.hamcrest.Matcher;
 
 import java.util.ArrayList;
+import java.util.Optional;
 
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
@@ -121,5 +123,68 @@ public void run() {
             }
         });
     }
+
+    public static void tap(Integer x, Integer y) {
+        onView(isRoot()).perform(new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return isRoot();
+            }
+
+            @Override
+            public String getDescription() {
+                return "tap on screen";
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                ViewAction action = DetoxAction.tapAtLocation(x, y);
+                action.perform(uiController, view);
+                uiController.loopMainThreadUntilIdle();
+            }
+        });
+    }
+
+    public static void longPress(Integer x, Integer y) {
+        onView(isRoot()).perform(new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return isRoot();
+            }
+
+            @Override
+            public String getDescription() {
+                return "long press on screen";
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                ViewAction action = DetoxAction.longPress(x, y);
+                action.perform(uiController, view);
+                uiController.loopMainThreadUntilIdle();
+            }
+        });
+    }
+
+    public static void longPress(Integer x, Integer y, Integer duration) {
+        onView(isRoot()).perform(new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return isRoot();
+            }
+
+            @Override
+            public String getDescription() {
+                return "long press on screen";
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                ViewAction action = DetoxAction.longPress(x, y, duration);
+                action.perform(uiController, view);
+                uiController.loopMainThreadUntilIdle();
+            }
+        });
+    }
 }
 
diff --git a/detox/detox.d.ts b/detox/detox.d.ts
index c1110e417c..2e26c4d196 100644
--- a/detox/detox.d.ts
+++ b/detox/detox.d.ts
@@ -782,10 +782,15 @@ declare global {
             setOrientation(orientation: Orientation): Promise<void>;
 
             /**
-             * Perform a click at arbitrary coordinates on the default display specified by the user. Currently only available in the Android Simulator.
+             * Perform a tap at arbitrary coordinates on the default display specified by the user. Currently only available in the Android Simulator.
              */
             tap(point?: Point2D): Promise<void>;
 
+            /**
+             * Perform a long press at arbitrary coordinates on the default display specified by the user. Custom press duration if needed. Currently only available in the Android Simulator.
+             */
+            longPress(point?: Point2D, duration?: number): Promise<void>;
+
             /**
              * Sets the simulator/emulator location to the given latitude and longitude.
              *
diff --git a/detox/src/android/espressoapi/EspressoDetox.js b/detox/src/android/espressoapi/EspressoDetox.js
index c4b59deec6..659068f8a2 100644
--- a/detox/src/android/espressoapi/EspressoDetox.js
+++ b/detox/src/android/espressoapi/EspressoDetox.js
@@ -73,6 +73,77 @@ class EspressoDetox {
     };
   }
 
+  static tap(x, y) {
+    if (typeof x !== "number") throw new Error("x should be a number, but got " + (x + (" (" + (typeof x + ")"))));
+    if (typeof y !== "number") throw new Error("y should be a number, but got " + (y + (" (" + (typeof y + ")"))));
+    return {
+      target: {
+        type: "Class",
+        value: "com.wix.detox.espresso.EspressoDetox"
+      },
+      method: "tap",
+      args: [{
+        type: "Integer",
+        value: x
+      }, {
+        type: "Integer",
+        value: y
+      }]
+    };
+  }
+
+  static longPress(x, y) {
+    function longPress2(x, y) {
+      if (typeof x !== "number") throw new Error("x should be a number, but got " + (x + (" (" + (typeof x + ")"))));
+      if (typeof y !== "number") throw new Error("y should be a number, but got " + (y + (" (" + (typeof y + ")"))));
+      return {
+        target: {
+          type: "Class",
+          value: "com.wix.detox.espresso.EspressoDetox"
+        },
+        method: "longPress",
+        args: [{
+          type: "Integer",
+          value: x
+        }, {
+          type: "Integer",
+          value: y
+        }]
+      };
+    }
+
+    function longPress3(x, y, duration) {
+      if (typeof x !== "number") throw new Error("x should be a number, but got " + (x + (" (" + (typeof x + ")"))));
+      if (typeof y !== "number") throw new Error("y should be a number, but got " + (y + (" (" + (typeof y + ")"))));
+      if (typeof duration !== "number") throw new Error("duration should be a number, but got " + (duration + (" (" + (typeof duration + ")"))));
+      return {
+        target: {
+          type: "Class",
+          value: "com.wix.detox.espresso.EspressoDetox"
+        },
+        method: "longPress",
+        args: [{
+          type: "Integer",
+          value: x
+        }, {
+          type: "Integer",
+          value: y
+        }, {
+          type: "Integer",
+          value: duration
+        }]
+      };
+    }
+
+    if (arguments.length === 2) {
+      return longPress2.apply(null, arguments);
+    }
+
+    if (arguments.length === 3) {
+      return longPress3.apply(null, arguments);
+    }
+  }
+
 }
 
 module.exports = EspressoDetox;
\ No newline at end of file
diff --git a/detox/src/devices/runtime/RuntimeDevice.js b/detox/src/devices/runtime/RuntimeDevice.js
index c8cb5e93f0..cad893d440 100644
--- a/detox/src/devices/runtime/RuntimeDevice.js
+++ b/detox/src/devices/runtime/RuntimeDevice.js
@@ -282,6 +282,10 @@ class RuntimeDevice {
     await this.deviceDriver.tap(point);
   }
 
+  async longPress(point, duration) {
+    await this.deviceDriver.longPress(point, duration);
+  }
+
   async setLocation(lat, lon) {
     lat = String(lat);
     lon = String(lon);
diff --git a/detox/src/devices/runtime/RuntimeDevice.test.js b/detox/src/devices/runtime/RuntimeDevice.test.js
index 62852ea28d..85a32c45d1 100644
--- a/detox/src/devices/runtime/RuntimeDevice.test.js
+++ b/detox/src/devices/runtime/RuntimeDevice.test.js
@@ -818,9 +818,19 @@ describe('Device', () => {
 
   it(`tap() should pass to device driver`, async () => {
     const device = await aValidDevice();
-    await device.tap('param');
+    const points = {x: 200, y: 200};
+    await device.tap(points);
 
-    expect(driverMock.driver.tap).toHaveBeenCalledWith('param');
+    expect(driverMock.driver.tap).toHaveBeenCalledWith(points);
+  });
+
+  it(`longPress() should pass to device driver`, async () => {
+    const device = await aValidDevice();
+    const points = {x: 200, y: 200};
+    const duration = 2000;
+    await device.longPress(points, duration);
+
+    expect(driverMock.driver.longPress).toHaveBeenCalledWith(points, duration);
   });
 
   it(`sendUserNotification() should pass to device driver`, async () => {
diff --git a/detox/src/devices/runtime/drivers/android/AndroidDriver.js b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
index f57c06ff88..6639dc4cce 100644
--- a/detox/src/devices/runtime/drivers/android/AndroidDriver.js
+++ b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
@@ -246,9 +246,17 @@ class AndroidDriver extends DeviceDriverBase {
   }
 
   async tap(point) {
-    let x = point?.x || await this.uiDevice.getDisplayWidth() / 2;
-    let y = point?.y || await this.uiDevice.getDisplayHeight() / 2;
-    await this.uiDevice.click(x, y);
+    let x = point?.x || 200;
+    let y = point?.y || 200;
+    const call = EspressoDetoxApi.tap(x, y);
+    await this.invocationManager.execute(call);
+  }
+
+  async longPress(point, duration) {
+    let x = point?.x || 200;
+    let y = point?.y || 200;
+    const call = !!duration ? EspressoDetoxApi.longPress(x, y, duration): EspressoDetoxApi.longPress(x, y);
+    await this.invocationManager.execute(call);
   }
 
   _getAppInstallPaths(_appBinaryPath, _testBinaryPath) {
diff --git a/detox/src/devices/runtime/drivers/ios/SimulatorDriver.js b/detox/src/devices/runtime/drivers/ios/SimulatorDriver.js
index 62efd48dd4..2417361dc4 100644
--- a/detox/src/devices/runtime/drivers/ios/SimulatorDriver.js
+++ b/detox/src/devices/runtime/drivers/ios/SimulatorDriver.js
@@ -201,6 +201,10 @@ class SimulatorDriver extends IosDriver {
   async resetStatusBar() {
     await this._applesimutils.statusBarReset(this.udid);
   }
+
+  async tap(points) {
+    
+  }
 }
 
 module.exports = SimulatorDriver;
diff --git a/detox/test/e2e/06.device.test.js b/detox/test/e2e/06.device.test.js
index d75df3ebf9..3b076d816a 100644
--- a/detox/test/e2e/06.device.test.js
+++ b/detox/test/e2e/06.device.test.js
@@ -86,15 +86,33 @@ describe('Device', () => {
   });
 
   it(':android: tap on screen', async () => {
+    await device.launchApp({ newInstance: true });
     await element(by.text('Device Tap')).tap();
     await device.tap();
     await expect(element(by.text('Screen Tapped'))).toBeVisible();
   });
 
   it(':android: tap on screen by coordinates', async () => {
+    await device.launchApp({ newInstance: true });
     await element(by.text('Device Tap')).tap();
-    const point = {x: 200, y: 200}
+    const point = {x: 200, y: 243}
     await device.tap(point);
     await expect(element(by.text('Button Tapped'))).toBeVisible();
   });
+
+  it(':android: long press on screen by coordinates', async () => {
+    await device.launchApp({ newInstance: true });
+    await element(by.text('Device Tap')).tap();
+    const point = {x: 150, y: 300}
+    await device.longPress(point);
+    await expect(element(by.text('Screen Long Pressed'))).toBeVisible();
+  });
+
+  it(':android: long press on screen by coordinates with duration', async () => {
+    await device.launchApp({ newInstance: true });
+    await element(by.text('Device Tap')).tap();
+    const point = {x: 200, y: 190}
+    await device.longPress(point, 2000);
+    await expect(element(by.text('Screen Long Custom Duration Pressed'))).toBeVisible();
+  });
 });
diff --git a/detox/test/src/Screens/DeviceTapScreen.tsx b/detox/test/src/Screens/DeviceTapScreen.tsx
index 1d258d1863..a829d28c93 100644
--- a/detox/test/src/Screens/DeviceTapScreen.tsx
+++ b/detox/test/src/Screens/DeviceTapScreen.tsx
@@ -4,6 +4,12 @@ import { Button, Text, TouchableOpacity, View } from 'react-native';
 const DeviceTapScreen = () => {
   const [shouldShowScreenText, setShouldShowScreenText] = useState(false);
   const [shouldShowButtonText, setShouldShowButtonText] = useState(false);
+  const [shouldShowLongText, setShouldShowLongText] = useState(false);
+  const [shouldShowLongCustomText, setShouldShowLongCustomText] = useState(false);
+
+  const onPressLongCustom = useCallback(() => {
+    setShouldShowLongCustomText(true);
+  }, [setShouldShowLongCustomText]);
 
   const onPressScreen = useCallback(() => {
     setShouldShowScreenText(true);
@@ -11,16 +17,26 @@ const DeviceTapScreen = () => {
 
   const onPressButton = useCallback(() => {
     setShouldShowButtonText(true);
-  }, [setShouldShowScreenText]);
+  }, [setShouldShowButtonText]);
+
+  const onPressLong = useCallback(() => {
+    setShouldShowLongText(true);
+  }, [setShouldShowLongText]);
 
-  return (
-    <TouchableOpacity onPress={onPressScreen} style={{ flex: 1 }}>
-      <View style={{ left: 40, top: 25, position: 'absolute' }}>
+  return (<>
+    <TouchableOpacity onLongPress={onPressLong} onPress={onPressScreen} style={{ flex: 1 }}>
+      <View style={{ left: 190, top: 190, position: 'absolute' }}>
         <Button onPress={onPressButton} title="TAP ME" />
       </View>
+      <TouchableOpacity delayLongPress={1500} onLongPress={onPressLongCustom} style={{ left: 150, top: 150, position: 'absolute' }}>
+        <Text>{'TAP LONG TIME'}</Text>
+      </TouchableOpacity>
+      {shouldShowLongCustomText && <Text>{'Screen Long Custom Duration Pressed'}</Text>}
+      {shouldShowLongText && <Text>{'Screen Long Pressed'}</Text>}
       {shouldShowScreenText && <Text>{'Screen Tapped'}</Text>}
       {shouldShowButtonText && <Text>{'Button Tapped'}</Text>}
     </TouchableOpacity>
+  </>
   );
 };
 
diff --git a/detox/test/src/app.js b/detox/test/src/app.js
index 1ec9f3a61a..b666406505 100644
--- a/detox/test/src/app.js
+++ b/detox/test/src/app.js
@@ -90,7 +90,7 @@ export default class example extends Component {
         {this.renderScreenButton('Network', Screens.NetworkScreen)}
         {this.renderAnimationScreenButtons()}
         {this.renderScreenButton('Device', Screens.DeviceScreen)}
-        {this.renderScreenButton('Device Tap', Screens.DeviceTapScreen)}
+        {isAndroid && this.renderScreenButton('Device Tap', Screens.DeviceTapScreen)}
         {isIos && this.renderScreenButton('Overlay', Screens.OverlayScreen)}
         {this.renderScreenButton('Location', Screens.LocationScreen)}
         {this.renderScreenButton('DatePicker', Screens.DatePickerScreen)}

From 66a7ecc9a1f2710f049b6838fe0a2e5d2df3a21c Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Thu, 1 Aug 2024 10:19:15 +0300
Subject: [PATCH 05/11] android api improvements

---
 .../com/wix/detox/espresso/EspressoDetox.java | 19 +------------------
 detox/detox.d.ts                              |  6 +++++-
 .../runtime/drivers/android/AndroidDriver.js  |  8 ++++----
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
index 9a4dc3783b..b34e2dd21f 100644
--- a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
+++ b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
@@ -146,24 +146,7 @@ public void perform(UiController uiController, View view) {
     }
 
     public static void longPress(Integer x, Integer y) {
-        onView(isRoot()).perform(new ViewAction() {
-            @Override
-            public Matcher<View> getConstraints() {
-                return isRoot();
-            }
-
-            @Override
-            public String getDescription() {
-                return "long press on screen";
-            }
-
-            @Override
-            public void perform(UiController uiController, View view) {
-                ViewAction action = DetoxAction.longPress(x, y);
-                action.perform(uiController, view);
-                uiController.loopMainThreadUntilIdle();
-            }
-        });
+        longPress(x, y, null);
     }
 
     public static void longPress(Integer x, Integer y, Integer duration) {
diff --git a/detox/detox.d.ts b/detox/detox.d.ts
index 2e26c4d196..3c24cebe6a 100644
--- a/detox/detox.d.ts
+++ b/detox/detox.d.ts
@@ -783,13 +783,17 @@ declare global {
 
             /**
              * Perform a tap at arbitrary coordinates on the default display specified by the user. Currently only available in the Android Simulator.
+             * defaults
              */
             tap(point?: Point2D): Promise<void>;
 
             /**
              * Perform a long press at arbitrary coordinates on the default display specified by the user. Custom press duration if needed. Currently only available in the Android Simulator.
              */
-            longPress(point?: Point2D, duration?: number): Promise<void>;
+            longPress(): Promise<void>;
+            longPress(point: Point2D): Promise<void>;
+            longPress(duration: number): Promise<void>;
+            longPress(point: Point2D, duration: number): Promise<void>;
 
             /**
              * Sets the simulator/emulator location to the given latitude and longitude.
diff --git a/detox/src/devices/runtime/drivers/android/AndroidDriver.js b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
index 6639dc4cce..29ab157156 100644
--- a/detox/src/devices/runtime/drivers/android/AndroidDriver.js
+++ b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
@@ -246,15 +246,15 @@ class AndroidDriver extends DeviceDriverBase {
   }
 
   async tap(point) {
-    let x = point?.x || 200;
-    let y = point?.y || 200;
+    let x = point?.x || 100;
+    let y = point?.y || 100;
     const call = EspressoDetoxApi.tap(x, y);
     await this.invocationManager.execute(call);
   }
 
   async longPress(point, duration) {
-    let x = point?.x || 200;
-    let y = point?.y || 200;
+    let x = point?.x || 100;
+    let y = point?.y || 100;
     const call = !!duration ? EspressoDetoxApi.longPress(x, y, duration): EspressoDetoxApi.longPress(x, y);
     await this.invocationManager.execute(call);
   }

From a6058c78830c4a11fa4c523562b0db34e55ac433 Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Thu, 1 Aug 2024 10:34:35 +0300
Subject: [PATCH 06/11] improve decleration

---
 detox/detox.d.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/detox/detox.d.ts b/detox/detox.d.ts
index 3c24cebe6a..9d1b723f68 100644
--- a/detox/detox.d.ts
+++ b/detox/detox.d.ts
@@ -783,12 +783,23 @@ declare global {
 
             /**
              * Perform a tap at arbitrary coordinates on the default display specified by the user. Currently only available in the Android Simulator.
-             * defaults
+             * @param point coordinates in the element's coordinate space. Optional (default is the center of the element). defaults: x: 100, y: 100
+             * @example await device.tap();
+             * @example await device.tap({ x: 100, y: 150 });
              */
-            tap(point?: Point2D): Promise<void>;
+            tap(): Promise<void>;
+            tap(point: Point2D): Promise<void>;
 
             /**
              * Perform a long press at arbitrary coordinates on the default display specified by the user. Custom press duration if needed. Currently only available in the Android Simulator.
+             * @param point coordinates in the element's coordinate space. Optional (default is the center of the element). defaults: x: 100, y: 100
+             * @param duration custom press duration time, in milliseconds. Optional (defaults to the standard long-press duration for the platform).
+             *      Custom durations should be used cautiously, as they can affect test consistency and user experience expectations.
+             *      They are typically necessary when testing components that behave differently from the platform's defaults or when simulating unique user interactions.
+             * @example await device.longPress();
+             * @example await device.longPress({ x: 100, y: 150 });
+             * @example await device.longPress(2000);
+             * @example await device.longPress({ x: 100, y: 150 }, 2000);
              */
             longPress(): Promise<void>;
             longPress(point: Point2D): Promise<void>;

From b7c7252680ae80e252fac2df0a7046242578a50f Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Thu, 1 Aug 2024 10:36:54 +0300
Subject: [PATCH 07/11] clean

---
 detox/src/devices/runtime/drivers/ios/SimulatorDriver.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/detox/src/devices/runtime/drivers/ios/SimulatorDriver.js b/detox/src/devices/runtime/drivers/ios/SimulatorDriver.js
index 2417361dc4..62efd48dd4 100644
--- a/detox/src/devices/runtime/drivers/ios/SimulatorDriver.js
+++ b/detox/src/devices/runtime/drivers/ios/SimulatorDriver.js
@@ -201,10 +201,6 @@ class SimulatorDriver extends IosDriver {
   async resetStatusBar() {
     await this._applesimutils.statusBarReset(this.udid);
   }
-
-  async tap(points) {
-    
-  }
 }
 
 module.exports = SimulatorDriver;

From ae6b2b90199ea8f76a5b7d2745df447035f34b86 Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Thu, 1 Aug 2024 17:13:18 +0300
Subject: [PATCH 08/11] some cleanup

---
 .../src/full/java/com/wix/detox/espresso/EspressoDetox.java   | 2 --
 detox/detox.d.ts                                              | 1 -
 detox/src/devices/runtime/RuntimeDevice.test.js               | 4 ++--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
index b34e2dd21f..ef0915108f 100644
--- a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
+++ b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
@@ -6,7 +6,6 @@
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.pm.ActivityInfo;
-import android.os.Debug;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,7 +18,6 @@
 import org.hamcrest.Matcher;
 
 import java.util.ArrayList;
-import java.util.Optional;
 
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
diff --git a/detox/detox.d.ts b/detox/detox.d.ts
index 732e7693fa..009e4c0c05 100644
--- a/detox/detox.d.ts
+++ b/detox/detox.d.ts
@@ -1479,7 +1479,6 @@ declare global {
              */
             longPress(): Promise<void>;
             longPress(point: Point2D): Promise<void>;
-            longPress(duration: number): Promise<void>;
             longPress(point: Point2D, duration: number): Promise<void>;
 
             /**
diff --git a/detox/src/devices/runtime/RuntimeDevice.test.js b/detox/src/devices/runtime/RuntimeDevice.test.js
index 85a32c45d1..653c2237ba 100644
--- a/detox/src/devices/runtime/RuntimeDevice.test.js
+++ b/detox/src/devices/runtime/RuntimeDevice.test.js
@@ -818,7 +818,7 @@ describe('Device', () => {
 
   it(`tap() should pass to device driver`, async () => {
     const device = await aValidDevice();
-    const points = {x: 200, y: 200};
+    const points = { x: 200, y: 200 };
     await device.tap(points);
 
     expect(driverMock.driver.tap).toHaveBeenCalledWith(points);
@@ -826,7 +826,7 @@ describe('Device', () => {
 
   it(`longPress() should pass to device driver`, async () => {
     const device = await aValidDevice();
-    const points = {x: 200, y: 200};
+    const points = { x: 200, y: 200 };
     const duration = 2000;
     await device.longPress(points, duration);
 

From aa7974d407858963bf4a1b614486ed7826e89a6a Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Sun, 4 Aug 2024 09:57:44 +0300
Subject: [PATCH 09/11] map arguments'

---
 detox/detox.d.ts                           | 1 +
 detox/src/devices/runtime/RuntimeDevice.js | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/detox/detox.d.ts b/detox/detox.d.ts
index 009e4c0c05..732e7693fa 100644
--- a/detox/detox.d.ts
+++ b/detox/detox.d.ts
@@ -1479,6 +1479,7 @@ declare global {
              */
             longPress(): Promise<void>;
             longPress(point: Point2D): Promise<void>;
+            longPress(duration: number): Promise<void>;
             longPress(point: Point2D, duration: number): Promise<void>;
 
             /**
diff --git a/detox/src/devices/runtime/RuntimeDevice.js b/detox/src/devices/runtime/RuntimeDevice.js
index cad893d440..30cdc5340a 100644
--- a/detox/src/devices/runtime/RuntimeDevice.js
+++ b/detox/src/devices/runtime/RuntimeDevice.js
@@ -3,6 +3,7 @@ const debug = require('../../utils/debug'); // debug utils, leave here even if u
 const log = require('../../utils/logger').child({ cat: 'device' });
 const traceMethods = require('../../utils/traceMethods');
 const wrapWithStackTraceCutter = require('../../utils/wrapWithStackTraceCutter');
+const mapLongPressArguments = require('../../utils/mapLongPressArguments');
 
 const LaunchArgsEditor = require('./utils/LaunchArgsEditor');
 
@@ -282,7 +283,9 @@ class RuntimeDevice {
     await this.deviceDriver.tap(point);
   }
 
-  async longPress(point, duration) {
+  async longPress(arg1, arg2) {
+    let { point, duration } = mapLongPressArguments(arg1, arg2);
+
     await this.deviceDriver.longPress(point, duration);
   }
 

From 4082fcdb8b52b9379b82350869605ae8fe5ef4dd Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Fri, 6 Sep 2024 14:21:01 +0300
Subject: [PATCH 10/11] add prop shouldIgnoreStatusBar

---
 .../java/com/wix/detox/espresso/EspressoDetox.java   |  3 ++-
 .../com/wix/detox/espresso/UiAutomatorHelper.java    | 12 ++++++++++++
 detox/src/devices/runtime/RuntimeDevice.js           |  4 ++--
 .../src/devices/runtime/drivers/DeviceDriverBase.js  |  6 +++++-
 .../devices/runtime/drivers/android/AndroidDriver.js | 12 ++++++------
 5 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
index ef0915108f..5eb831aa5d 100644
--- a/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
+++ b/detox/android/detox/src/full/java/com/wix/detox/espresso/EspressoDetox.java
@@ -136,7 +136,8 @@ public String getDescription() {
 
             @Override
             public void perform(UiController uiController, View view) {
-                ViewAction action = DetoxAction.tapAtLocation(x, y);
+                int adjustedY = true ? y + UiAutomatorHelper.getStatusBarHeight(view) : y;
+                ViewAction action = DetoxAction.tapAtLocation(x, adjustedY);
                 action.perform(uiController, view);
                 uiController.loopMainThreadUntilIdle();
             }
diff --git a/detox/android/detox/src/full/java/com/wix/detox/espresso/UiAutomatorHelper.java b/detox/android/detox/src/full/java/com/wix/detox/espresso/UiAutomatorHelper.java
index 717a765b13..3fdc091822 100644
--- a/detox/android/detox/src/full/java/com/wix/detox/espresso/UiAutomatorHelper.java
+++ b/detox/android/detox/src/full/java/com/wix/detox/espresso/UiAutomatorHelper.java
@@ -1,8 +1,13 @@
 package com.wix.detox.espresso;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.os.Handler;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Choreographer;
+import android.view.View;
 
 import com.wix.detox.common.UIThread;
 import com.wix.detox.espresso.action.common.utils.UiControllerUtils;
@@ -111,4 +116,11 @@ public void doFrame(long frameTimeNanos) {
         }
     }
 
+    @SuppressLint({"DiscouragedApi", "InternalInsetResource"})
+    public static int getStatusBarHeight(View view) {
+        Context context = view.getContext();
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        return (int) (context.getResources().getDimensionPixelSize(resourceId) / ((float) context.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT));
+        //return resourceId > 0 ? context.getResources().getDimensionPixelSize(resourceId) : 0;
+    }
 }
diff --git a/detox/src/devices/runtime/RuntimeDevice.js b/detox/src/devices/runtime/RuntimeDevice.js
index 30cdc5340a..92dbd94e25 100644
--- a/detox/src/devices/runtime/RuntimeDevice.js
+++ b/detox/src/devices/runtime/RuntimeDevice.js
@@ -279,8 +279,8 @@ class RuntimeDevice {
     await this.deviceDriver.setOrientation(orientation);
   }
 
-  async tap(point) {
-    await this.deviceDriver.tap(point);
+  async tap(point, shouldIgnoreStatusBar) {
+    await this.deviceDriver.tap(point, shouldIgnoreStatusBar);
   }
 
   async longPress(arg1, arg2) {
diff --git a/detox/src/devices/runtime/drivers/DeviceDriverBase.js b/detox/src/devices/runtime/drivers/DeviceDriverBase.js
index 658ab515b3..0525d93176 100644
--- a/detox/src/devices/runtime/drivers/DeviceDriverBase.js
+++ b/detox/src/devices/runtime/drivers/DeviceDriverBase.js
@@ -51,7 +51,11 @@ class DeviceDriverBase {
     return '';
   }
 
-  async tap(point) {
+  async tap(point, shouldIgnoreStatusBar) {
+    return '';
+  }
+
+  async longPress(arg1, arg2) {
     return '';
   }
 
diff --git a/detox/src/devices/runtime/drivers/android/AndroidDriver.js b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
index 29ab157156..3a4d7ee8aa 100644
--- a/detox/src/devices/runtime/drivers/android/AndroidDriver.js
+++ b/detox/src/devices/runtime/drivers/android/AndroidDriver.js
@@ -245,16 +245,16 @@ class AndroidDriver extends DeviceDriverBase {
     await this.invocationManager.execute(call);
   }
 
-  async tap(point) {
-    let x = point?.x || 100;
-    let y = point?.y || 100;
-    const call = EspressoDetoxApi.tap(x, y);
+  async tap(point, shouldIgnoreStatusBar = false) {
+    let x = point?.x ?? 100;
+    let y = point?.y ?? 100;
+    const call = EspressoDetoxApi.tap(x, y, shouldIgnoreStatusBar);
     await this.invocationManager.execute(call);
   }
 
   async longPress(point, duration) {
-    let x = point?.x || 100;
-    let y = point?.y || 100;
+    let x = point?.x ?? 100;
+    let y = point?.y ?? 100;
     const call = !!duration ? EspressoDetoxApi.longPress(x, y, duration): EspressoDetoxApi.longPress(x, y);
     await this.invocationManager.execute(call);
   }

From a8173e3bcfed99ba3c6ccd1123e83df7adb755ca Mon Sep 17 00:00:00 2001
From: gayablau <gayab@wix.com>
Date: Fri, 6 Sep 2024 14:23:04 +0300
Subject: [PATCH 11/11] fix test

---
 detox/test/e2e/06.device.test.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/detox/test/e2e/06.device.test.js b/detox/test/e2e/06.device.test.js
index 3b076d816a..73fe8c83de 100644
--- a/detox/test/e2e/06.device.test.js
+++ b/detox/test/e2e/06.device.test.js
@@ -95,8 +95,8 @@ describe('Device', () => {
   it(':android: tap on screen by coordinates', async () => {
     await device.launchApp({ newInstance: true });
     await element(by.text('Device Tap')).tap();
-    const point = {x: 200, y: 243}
-    await device.tap(point);
+    const point = {x: 210, y: 200}
+    await device.tap(point, true);
     await expect(element(by.text('Button Tapped'))).toBeVisible();
   });
 
@@ -115,4 +115,12 @@ describe('Device', () => {
     await device.longPress(point, 2000);
     await expect(element(by.text('Screen Long Custom Duration Pressed'))).toBeVisible();
   });
+
+  it(':android: long press on screen by coordinates with duration', async () => {
+    await device.launchApp({ newInstance: true });
+    await element(by.text('Device Tap')).tap();
+    const point = {x: 200, y: 190}
+    await device.longPress(2000);
+    await expect(element(by.text('Screen Long Custom Duration Pressed'))).toBeVisible();
+  });
 });