Rename SwipeDirection to Direction

Author: SvetoslavTsenov

index.d.ts

@@ -3,7 +3,7 @@ export { ElementHelper } from "./lib/element-helper";
 export { UIElement } from "./lib/ui-element";
 export { Point } from "./lib/point";
 export { SearchOptions } from "./lib/search-options";
-export { SwipeDirection } from "./lib/swipe-direction";
+export { Direction } from "./lib/direction";
 export declare function startServer(port?: number): Promise<void>;
 export declare function stopServer(): Promise<void>;
 export declare function createDriver(): Promise<any>;

index.ts

@@ -10,7 +10,7 @@ export { ElementHelper } from "./lib/element-helper";
 export { UIElement } from "./lib/ui-element";
 export { Point } from "./lib/point";
 export { SearchOptions } from "./lib/search-options";
-export { SwipeDirection } from "./lib/swipe-direction";
+export { Direction } from "./lib/direction";
 
 const nsCapabilities = new NsCapabilities();
 const appiumServer = new AppiumServer(nsCapabilities);

lib/appium-driver.d.ts

@@ -2,7 +2,7 @@ export declare var should: any;
 import { ElementHelper } from "./element-helper";
 import { SearchOptions } from "./search-options";
 import { UIElement } from "./ui-element";
-import { SwipeDirection } from "./swipe-direction";
+import { Direction } from "./direction";
 import { INsCapabilities } from "./ins-capabilities";
 import { Point } from "./point";
 export declare class AppiumDriver {
@@ -93,7 +93,7 @@ export declare class AppiumDriver {
      * @param xOffset
      * @param retryCount
      */
-    scrollToElement(direction: SwipeDirection, element: any, startPoint: Point, yOffset: number, xOffset?: number, retryCount?: number): Promise<any>;
+    scrollToElement(direction: Direction, element: any, startPoint: Point, yOffset: number, xOffset?: number, retryCount?: number): Promise<any>;
     /**
      * Swipe from point with offset and inertia according to duatio
      * @param y

lib/appium-driver.ts

@@ -10,7 +10,7 @@ import { searchCustomCapabilities } from "./capabilities-helper";
 import { ElementHelper } from "./element-helper";
 import { SearchOptions } from "./search-options";
 import { UIElement } from "./ui-element";
-import { SwipeDirection } from "./swipe-direction";
+import { Direction } from "./direction";
 import {
     log,
     getStorage,
@@ -176,7 +176,7 @@ export class AppiumDriver {
      * @param xOffset 
      * @param retryCount 
      */
-    public async scrollToElement(direction: SwipeDirection, element: any, startPoint: Point, yOffset: number, xOffset: number = 0, retryCount: number = 7) {
+    public async scrollToElement(direction: Direction, element: any, startPoint: Point, yOffset: number, xOffset: number = 0, retryCount: number = 7) {
         let el = null
         while (el === null && retryCount > 0) {
             try {

lib/swipe-direction.d.ts lib/direction.d.tslib/swipe-direction.d.ts renamed to lib/direction.d.ts

@@ -1,4 +1,4 @@
-export declare const enum SwipeDirection {
+export declare const enum Direction {
     down = 0,
     up = 1,
     left = 2,

lib/swipe-direction.ts lib/direction.tslib/swipe-direction.ts renamed to lib/direction.ts

@@ -1,4 +1,4 @@
-export const enum SwipeDirection {
+export const enum Direction {
     down,
     up,
     left,

lib/ui-element.d.ts

@@ -1,5 +1,5 @@
 import { Point } from "./point";
-import { SwipeDirection } from "./swipe-direction";
+import { Direction } from "./direction";
 export declare class UIElement {
     private _element;
     private _driver;
@@ -59,7 +59,7 @@ export declare class UIElement {
      * @param yOffset
      * @param xOffset
      */
-    scroll(direction: SwipeDirection, yOffset: number, xOffset?: number): Promise<void>;
+    scroll(direction: Direction, yOffset: number, xOffset?: number): Promise<void>;
     log(): Promise<void>;
     refetch(): Promise<any>;
 }

lib/ui-element.ts

@@ -1,5 +1,5 @@
 import { Point } from "./point";
-import { SwipeDirection } from "./swipe-direction";
+import { Direction } from "./direction";
 import { calculateOffset } from "./utils";
 
 export class UIElement {
@@ -96,7 +96,7 @@ export class UIElement {
      * @param yOffset 
      * @param xOffset 
      */
-    public async scroll(direction: SwipeDirection, yOffset: number, xOffset: number = 0) {
+    public async scroll(direction: Direction, yOffset: number, xOffset: number = 0) {
         //await this._driver.execute("mobile: scroll", [{direction: 'up'}])
         //await this._driver.execute('mobile: scroll', { direction: direction === 0 ? "down" : "up", element: this._element.ELEMENT });
         const location = await this.location();

lib/utils.d.ts

@@ -1,6 +1,6 @@
 import { INsCapabilities } from "./ins-capabilities";
 import { Point } from "./point";
-import { SwipeDirection } from "./swipe-direction";
+import { Direction } from "./direction";
 export declare function resolve(mainPath: any, ...args: any[]): any;
 export declare function fileExists(p: any): boolean;
 export declare function isFile(fullName: any): boolean;
@@ -31,4 +31,4 @@ export declare function calculateOffset(direction: any, y: number, yOffset: numb
  * @param duration
  * @param xOffset
  */
-export declare function scroll(wd: any, driver: any, direction: SwipeDirection, isIOS: boolean, y: number, x: number, yOffset: number, xOffset: number, verbose: any): Promise<void>;
+export declare function scroll(wd: any, driver: any, direction: Direction, isIOS: boolean, y: number, x: number, yOffset: number, xOffset: number, verbose: any): Promise<void>;

lib/utils.ts

@@ -6,7 +6,7 @@ import * as glob from "glob";
 require('colors');
 import { INsCapabilities } from "./ins-capabilities";
 import { Point } from "./point";
-import { SwipeDirection } from "./swipe-direction";
+import { Direction } from "./direction";
 
 export function resolve(mainPath, ...args) {
     if (!path.isAbsolute(mainPath)) {
@@ -292,29 +292,29 @@ export function calculateOffset(direction, y: number, yOffset: number, x: number
 
     if (isIOS) {
         speed = 100;
-        if (direction === SwipeDirection.down) {
+        if (direction === Direction.down) {
             direction = -1;
             yEnd = direction * yEnd;
         }
-        if (direction === SwipeDirection.right) {
+        if (direction === Direction.right) {
             direction = -1;
             xEnd = direction * xEnd;
         }
     } else {
-        if (direction === SwipeDirection.down) {
+        if (direction === Direction.down) {
             yEnd = Math.abs(yOffset - y);
         }
-        if (direction === SwipeDirection.up) {
+        if (direction === Direction.up) {
             yEnd = direction * Math.abs((Math.abs(yOffset) + y));
         }
 
         duration = Math.abs(yOffset) * speed;
 
-        if (direction === SwipeDirection.right) {
+        if (direction === Direction.right) {
             xEnd = Math.abs(xOffset - x);
         }
 
-        if (direction === SwipeDirection.left) {
+        if (direction === Direction.left) {
             xEnd = Math.abs(xOffset + x);
         }
 
@@ -336,7 +336,7 @@ export function calculateOffset(direction, y: number, yOffset: number, x: number
  * @param duration 
  * @param xOffset 
  */
-export async function scroll(wd, driver, direction: SwipeDirection, isIOS: boolean, y: number, x: number, yOffset: number, xOffset: number, verbose) {
+export async function scroll(wd, driver, direction: Direction, isIOS: boolean, y: number, x: number, yOffset: number, xOffset: number, verbose) {
     if (x === 0) {
         x = 20;
     }