Minor fixes:

- TouchActions:
-- Updating imports
-- beautifying code

- ITouchActions
-- Adding detailed description for swipeWithLongPress()

- ElementTouchActions
-- Updating imports
-- Updating references to ITouchActionsConfiguration

- ViewControlsScreen
-- updating imports

- AndroidBasicInteractionsTest
-- Adding new call to isDisplayed()

Author: n-verbitsky

src/main/java/aquality/appium/mobile/actions/ITouchActions.java

@@ -16,7 +16,7 @@ public interface ITouchActions {
     void swipe(Point startPoint, Point endPoint);
 
     /**
-     * Swipes from start point to end point using LongPress.
+     * Performs long press action and moves cursor from a start point to an end end point imitating the swipe action
      *
      * @param startPoint point on screen to swipe from.
      * @param endPoint   point on screen to swipe to.

src/main/java/aquality/appium/mobile/actions/TouchActions.java

@@ -1,7 +1,7 @@
 package aquality.appium.mobile.actions;
 
 import aquality.appium.mobile.application.AqualityServices;
-import aquality.appium.mobile.configuration.ISwipeConfiguration;
+import aquality.appium.mobile.configuration.ITouchActionsConfiguration;
 import aquality.selenium.core.utilities.IElementActionRetrier;
 import io.appium.java_client.TouchAction;
 import io.appium.java_client.touch.offset.PointOption;
@@ -19,8 +19,10 @@ public void swipe(Point startPoint, Point endPoint) {
                 startPoint.getY(),
                 endPoint.getX(),
                 endPoint.getY());
-        performTouchAction(touchAction -> touchAction.press(PointOption.point(startPoint))
-                .waitAction(waitOptions(AqualityServices.get(ISwipeConfiguration.class).getTimeout())), endPoint);
+        performTouchAction(touchAction -> touchAction
+                .press(PointOption.point(startPoint))
+                .waitAction(waitOptions(AqualityServices.get(ITouchActionsConfiguration.class).getSwipeTimeout())),
+                endPoint);
     }
 
     @Override

src/main/java/aquality/appium/mobile/elements/actions/ElementTouchActions.java

@@ -3,7 +3,7 @@
 import aquality.appium.mobile.actions.ITouchActions;
 import aquality.appium.mobile.actions.SwipeDirection;
 import aquality.appium.mobile.application.AqualityServices;
-import aquality.appium.mobile.configuration.ISwipeConfiguration;
+import aquality.appium.mobile.configuration.ITouchActionsConfiguration;
 import aquality.appium.mobile.elements.interfaces.IElement;
 import org.openqa.selenium.Dimension;
 import org.openqa.selenium.Point;
@@ -23,20 +23,20 @@ public ElementTouchActions(IElement element) {
         this.element = element;
         this.scrollDownStartPoint = recalculatePointCoordinates(
                 getBottomRightCornerPoint(),
-                getISwipeConfiguration().getHorizontalSwipeBottomPointXCoefficient(),
-                getISwipeConfiguration().getHorizontalSwipeBottomPointYCoefficient());
+                getITouchActionsConfiguration().getHorizontalSwipeBottomPointXCoefficient(),
+                getITouchActionsConfiguration().getHorizontalSwipeBottomPointYCoefficient());
         this.scrollDownEndPoint = recalculatePointCoordinates(
                 getBottomRightCornerPoint(),
-                getISwipeConfiguration().getHorizontalSwipeTopPointXCoefficient(),
-                getISwipeConfiguration().getHorizontalSwipeTopPointYCoefficient());
+                getITouchActionsConfiguration().getHorizontalSwipeTopPointXCoefficient(),
+                getITouchActionsConfiguration().getHorizontalSwipeTopPointYCoefficient());
         this.swipeLeftStartPoint = recalculatePointCoordinates(
                 getBottomRightCornerPoint(),
-                getISwipeConfiguration().getVerticalSwipeRightPointXCoefficient(),
-                getISwipeConfiguration().getVerticalSwipeRightPointYCoefficient());
+                getITouchActionsConfiguration().getVerticalSwipeRightPointXCoefficient(),
+                getITouchActionsConfiguration().getVerticalSwipeRightPointYCoefficient());
         this.swipeLeftEndPoint = recalculatePointCoordinates(
                 getBottomRightCornerPoint(),
-                getISwipeConfiguration().getVerticalSwipeLeftPointXCoefficient(),
-                getISwipeConfiguration().getVerticalSwipeLeftPointYCoefficient());
+                getITouchActionsConfiguration().getVerticalSwipeLeftPointXCoefficient(),
+                getITouchActionsConfiguration().getVerticalSwipeLeftPointYCoefficient());
         this.scrollUpStartPoint = this.scrollDownEndPoint;
         this.scrollUpEndPoint = this.scrollDownStartPoint;
         this.swipeRightStartPoint = this.swipeLeftEndPoint;
@@ -55,7 +55,7 @@ public void swipeWithLongPress(Point endPoint) {
 
     @Override
     public void scrollToElement(SwipeDirection direction) {
-        int numberOfRetries = AqualityServices.get(ISwipeConfiguration.class).getRetries();
+        int numberOfRetries = AqualityServices.get(ITouchActionsConfiguration.class).getSwipeRetries();
         ITouchActions touchActions = AqualityServices.getTouchActions();
         while (numberOfRetries > 0) {
             if (!element.state().isDisplayed()) {
@@ -104,11 +104,11 @@ private Point recalculatePointCoordinates(Point point, double coefficientX, doub
     }
 
     /**
-     * Returns ISwipeConfiguration class.
+     * Returns ITouchActionsConfiguration class.
      *
-     * @return ISwipeConfiguration class
+     * @return ITouchActionsConfiguration class
      */
-    private ISwipeConfiguration getISwipeConfiguration() {
-        return AqualityServices.get(ISwipeConfiguration.class);
+    private ITouchActionsConfiguration getITouchActionsConfiguration() {
+        return AqualityServices.get(ITouchActionsConfiguration.class);
     }
 }

src/test/java/samples/android/nativeapp/AndroidBasicInteractionsTest.java

@@ -101,7 +101,7 @@ public void testVerticalSwipeToElement() {
     @Test
     public void testHorizontalSwipeToElement() {
         ViewTabsScrollableScreen viewTabsScrollableScreen = ApplicationActivity.VIEW_TABS_SCROLLABLE.open();
-        Assert.assertTrue(viewTabsScrollableScreen.isDisplayed(),
+        Assert.assertTrue(viewTabsScrollableScreen.state().isDisplayed(),
                 String.format("%s screen should be opened", viewTabsScrollableScreen.getName()));
         viewTabsScrollableScreen.swipeTab(4, 1);
         viewTabsScrollableScreen.selectTab(7);

src/test/java/samples/android/nativeapp/apidemos/screens/ViewControlsScreen.java

@@ -1,7 +1,6 @@
 package samples.android.nativeapp.apidemos.screens;
 
 import aquality.appium.mobile.actions.SwipeDirection;
-import aquality.appium.mobile.elements.actions.ElementTouchActions;
 import aquality.appium.mobile.elements.interfaces.IButton;
 import aquality.appium.mobile.elements.interfaces.ICheckBox;
 import aquality.appium.mobile.elements.interfaces.ILabel;