[master] - fixed scale factor and top offset

Author: Denys Zaiats

src/main/java/net/itarray/automotion/internal/ResponsiveUIValidatorBase.java

@@ -124,9 +124,9 @@ private double getScaleFactor() {
     }
 
     private int getYOffset() {
-        if (isMobile() && getDriver().isAppiumWebContext() && getReport().isMobileTopBarOffset()) {
+        if (isMobile() && getDriver().isAppiumWebContext() && getReport().isMobileTopBarOffsetState()) {
             if (isIOS() || isAndroid()) {
-                return 20 * (int) getScaleFactor();
+                return (int) getReport().getMobileTopBarOffsetState();
             }
         }
         return 0;

src/main/java/net/itarray/automotion/validation/ResponsiveUIValidator.java

@@ -21,7 +21,8 @@ public class ResponsiveUIValidator {
     private final List<String> jsonFiles = new ArrayList<>();
     private net.itarray.automotion.validation.Units units = net.itarray.automotion.validation.Units.PX;
 
-    private boolean mobileTopBarOffset = false;
+    private boolean mobileTopBarOffsetState = false;
+    private double mobileTopBarOffset = 20;
     private final DrawingConfiguration drawingConfiguration = new DrawingConfiguration();
     private double scaleFactor = 1;
 
@@ -138,7 +139,18 @@ public ResponsiveUIValidator changeMetricsUnitsTo(util.validator.ResponsiveUIVal
      * @param state
      */
     public void setTopBarMobileOffset(boolean state) {
-        mobileTopBarOffset = state;
+        mobileTopBarOffsetState = state;
+    }
+
+    /**
+     * Set top bar mobile offset. Applicable only for native mobile testing
+     *
+     * @param state
+     * @param offset
+     */
+    public void setTopBarMobileOffset(boolean state, double offset) {
+        mobileTopBarOffsetState = state;
+        mobileTopBarOffset = offset;
     }
 
     /**
@@ -158,7 +170,11 @@ public double getRetinaScaleFactor() {
         return scaleFactor;
     }
 
-    public boolean isMobileTopBarOffset() {
+    public boolean isMobileTopBarOffsetState() {
+        return mobileTopBarOffsetState;
+    }
+
+    public double getMobileTopBarOffsetState() {
         return mobileTopBarOffset;
     }
 

src/main/java/util/validator/ResponsiveUIValidator.java

@@ -80,6 +80,16 @@ public void setTopBarMobileOffset(boolean state) {
         responsiveUIValidator.setTopBarMobileOffset(state);
     }
 
+    /**
+     * Set top bar mobile offset. Applicable only for native mobile testing
+     *
+     * @param state
+     * @param offset
+     */
+    public void setTopBarMobileOffset(boolean state, double offset) {
+        responsiveUIValidator.setTopBarMobileOffset(state, offset);
+    }
+
     /**
      * Set retina scale factor. Current usage only for native mobile
      *
@@ -90,7 +100,7 @@ public void setRetinaScaleFactor(double factor) {
     }
 
     public boolean isMobileTopBarOffset() {
-        return responsiveUIValidator.isMobileTopBarOffset();
+        return responsiveUIValidator.isMobileTopBarOffsetState();
     }
 
     /**