Added additional coverage and refined code

Author: shai-almog

CodenameOne/src/com/codename1/ui/Display.java

@@ -2698,8 +2698,6 @@ public int convertToPixels(float value, byte unitType) {
      * @since 8.0
      */
     public int convertToPixels(float value, byte unitType, boolean horizontal) {
-
-
         switch (unitType) {
             case Style.UNIT_TYPE_REM:
                 return Math.round(value * Font.getDefaultFont().getHeight());

CodenameOne/src/com/codename1/ui/Graphics.java

@@ -1091,9 +1091,9 @@ void drawImageArea(Image img, int x, int y, int imageX, int imageY, int imageWid
      * Draws a closed polygon defined by arrays of x and y coordinates.
      * Each pair of (x, y) coordinates defines a point.
      *
-     * @param xPoints - a an array of x coordinates.
-     * @param yPoints - a an array of y coordinates.
-     * @param nPoints - a the total number of points.
+     * @param xPoints - an array of x coordinates.
+     * @param yPoints - an array of y coordinates.
+     * @param nPoints - the total number of points.
      */
     public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) {
         int[] cX = xPoints;
@@ -1151,7 +1151,7 @@ public int concatenateAlpha(int a) {
     }
 
     /**
-     * Returnes the alpha as a value between 0-255 (0 - 0xff) where 255 is completely opaque
+     * Returns the alpha as a value between 0-255 (0 - 0xff) where 255 is completely opaque
      * and 0 is completely transparent
      *
      * @return the alpha value
@@ -1171,59 +1171,59 @@ public void setAlpha(int a) {
     }
 
     /**
-     * Returns true if anti-aliasing for standard rendering operations is supported,
-     * notice that text anti-aliasing is a separate attribute.
+     * Returns true if antialiasing for standard rendering operations is supported,
+     * notice that text antialiasing is a separate attribute.
      *
-     * @return true if anti aliasing is supported
+     * @return true if antialiasing is supported
      */
     public boolean isAntiAliasingSupported() {
         return impl.isAntiAliasingSupported(nativeGraphics);
     }
 
     /**
-     * Returns true if anti-aliasing for text is supported,
-     * notice that text anti-aliasing is a separate attribute from standard anti-alisaing.
+     * Returns true if antialiasing for text is supported,
+     * notice that text antialiasing is a separate attribute from standard anti-alisaing.
      *
-     * @return true if text anti aliasing is supported
+     * @return true if text antialiasing is supported
      */
     public boolean isAntiAliasedTextSupported() {
         return impl.isAntiAliasedTextSupported(nativeGraphics);
     }
 
 
     /**
-     * Returns true if anti-aliasing for standard rendering operations is turned on.
+     * Returns true if antialiasing for standard rendering operations is turned on.
      *
-     * @return true if anti aliasing is active
+     * @return true if antialiasing is active
      */
     public boolean isAntiAliased() {
         return impl.isAntiAliased(nativeGraphics);
     }
 
     /**
-     * Set whether anti-aliasing for standard rendering operations is turned on.
+     * Set whether antialiasing for standard rendering operations is turned on.
      *
-     * @param a true if anti aliasing is active
+     * @param a true if antialiasing is active
      */
     public void setAntiAliased(boolean a) {
         impl.setAntiAliased(nativeGraphics, a);
     }
 
     /**
-     * Indicates whether anti-aliasing for text is active,
-     * notice that text anti-aliasing is a separate attribute from standard anti-alisaing.
+     * Indicates whether antialiasing for text is active,
+     * notice that text antialiasing is a separate attribute from standard anti-alisaing.
      *
-     * @return true if text anti aliasing is supported
+     * @return true if text antialiasing is supported
      */
     public boolean isAntiAliasedText() {
         return impl.isAntiAliasedText(nativeGraphics);
     }
 
     /**
-     * Set whether anti-aliasing for text is active,
-     * notice that text anti-aliasing is a separate attribute from standard anti-alisaing.
+     * Set whether antialiasing for text is active,
+     * notice that text antialiasing is a separate attribute from standard anti-alisaing.
      *
-     * @param a true if text anti aliasing is supported
+     * @param a true if text antialiasing is supported
      */
     public void setAntiAliasedText(boolean a) {
         impl.setAntiAliasedText(nativeGraphics, a);

CodenameOne/src/com/codename1/ui/Image.java

@@ -392,7 +392,7 @@ public static Image exifRotation(String capturedImage, String rotatedImage, int
         boolean isJpeg = isJPEG(fss.openInputStream(capturedImage));
         boolean isPNG = isPNG(fss.openInputStream(capturedImage));
         String format;
-        // IMPORTANT: we cannot relies on the file extension of the capturedImage path,
+        // IMPORTANT: we cannot rely on the file extension of the capturedImage path,
         // because some Android devices return images from the gallery without extension!
         if (!isJpeg && !isPNG) {
             // Only jpeg and png images are supported, but some devices can return also different formats from the gallery (like gif).
@@ -472,7 +472,7 @@ public static Image exifRotation(String capturedImage, String rotatedImage, int
 
     /**
      * <p>
-     * Gets the EXIF orientation tag of an image, if it's available.</p>
+     * Gets the EXIF orientation tag of an image if it's available.</p>
      * <p>
      * The Exif Orientation Tag is a number from 0 to 8, for the explanation of
      * each value see the

scripts/android/tests/ProcessScreenshots.java

@@ -350,9 +350,6 @@ private static PNGImage loadPng(Path path) throws IOException {
             byte[] type = java.util.Arrays.copyOfRange(data, offset + 4, offset + 8);
             offset += 8;
             if (offset + length + 4 > data.length) {
-                System.out.println("Error processing PNG chunk of length: " + length +
-                        " with data length of: " + data.length +
-                        "\nTotal chunks: " + idatChunks);
                 throw new IOException("PNG chunk truncated before CRC while processing: " + path);
             }
             byte[] chunkData = java.util.Arrays.copyOfRange(data, offset, offset + length);

scripts/hellocodenameone/common/src/main/java/com/codenameone/examples/hellocodenameone/tests/AbstractGraphicsScreenshotTest.java

@@ -1,5 +1,6 @@
 package com.codenameone.examples.hellocodenameone.tests;
 
+import com.codename1.ui.CN;
 import com.codename1.ui.Component;
 import com.codename1.ui.Font;
 import com.codename1.ui.Form;
@@ -12,14 +13,18 @@
 public abstract class AbstractGraphicsScreenshotTest extends BaseTest {
     private final int[] colorSet = {0xff0000, 0xff00, 0xff, 0xffffff};
     private int currentColor = -1;
+    private int factor = 0;
 
     protected void nextColor(Graphics g) {
-        if (currentColor == -1) {
+        if(factor == 0) {
+            factor = CN.getDisplayWidth() < 400 ? 5 : 1;
+        }
+        if(currentColor == -1) {
             currentColor = 0;
             g.setColor(colorSet[0]);
         }
         g.darkerColor(1);
-        if (g.getColor() == 0) {
+        if(g.getColor() == 0) {
             currentColor++;
             if (currentColor == colorSet.length) {
                 currentColor = 0;

scripts/hellocodenameone/common/src/main/java/com/codenameone/examples/hellocodenameone/tests/Cn1ssDeviceRunner.java

@@ -7,16 +7,20 @@
 import com.codename1.ui.Display;
 import com.codename1.ui.Form;
 import com.codename1.util.StringUtil;
+import com.codenameone.examples.hellocodenameone.tests.graphics.AffineScale;
 import com.codenameone.examples.hellocodenameone.tests.graphics.DrawArc;
+import com.codenameone.examples.hellocodenameone.tests.graphics.DrawGradient;
 import com.codenameone.examples.hellocodenameone.tests.graphics.DrawImage;
 import com.codenameone.examples.hellocodenameone.tests.graphics.DrawLine;
 import com.codenameone.examples.hellocodenameone.tests.graphics.DrawRect;
 import com.codenameone.examples.hellocodenameone.tests.graphics.DrawRoundRect;
 import com.codenameone.examples.hellocodenameone.tests.graphics.DrawString;
 import com.codenameone.examples.hellocodenameone.tests.graphics.DrawStringDecorated;
 import com.codenameone.examples.hellocodenameone.tests.graphics.FillArc;
+import com.codenameone.examples.hellocodenameone.tests.graphics.FillPolygon;
 import com.codenameone.examples.hellocodenameone.tests.graphics.FillRect;
 import com.codenameone.examples.hellocodenameone.tests.graphics.FillRoundRect;
+import com.codenameone.examples.hellocodenameone.tests.graphics.Scale;
 
 public final class Cn1ssDeviceRunner extends DeviceRunner {
     private static final BaseTest[] TEST_CLASSES = new BaseTest[] {
@@ -31,6 +35,10 @@ public final class Cn1ssDeviceRunner extends DeviceRunner {
             new DrawString(),
             new DrawImage(),
             new DrawStringDecorated(),
+            new DrawGradient(),
+            new FillPolygon(),
+            new AffineScale(),
+            new Scale(),
             new BrowserComponentScreenshotTest(),
             new MediaPlaybackScreenshotTest()
     };

scripts/hellocodenameone/common/src/main/java/com/codenameone/examples/hellocodenameone/tests/graphics/AffineScale.java

@@ -0,0 +1,38 @@
+package com.codenameone.examples.hellocodenameone.tests.graphics;
+
+import com.codename1.ui.Graphics;
+import com.codename1.ui.Transform;
+import com.codename1.ui.geom.AffineTransform;
+import com.codename1.ui.geom.Rectangle;
+import com.codenameone.examples.hellocodenameone.tests.AbstractGraphicsScreenshotTest;
+
+public class AffineScale extends AbstractGraphicsScreenshotTest {
+
+    @Override
+    protected void drawContent(Graphics g, Rectangle bounds) {
+        if(!g.isAffineSupported()) {
+            g.drawString("Affine unsupported", 0, 0);
+            return;
+        }
+
+        float xScale = 0.01f * ((float)bounds.getHeight());
+        float yScale = 0.01f * ((float)bounds.getWidth());
+        AffineTransform affine = new AffineTransform();
+        affine.setToScale(xScale, yScale);
+        Transform transform = affine.toTransform();
+        int translateX = (int)(bounds.getX() / xScale);
+        int translateY = (int)(bounds.getY() / yScale);
+        transform.translate(translateX, translateY);
+        g.setTransform(transform);
+        g.fillLinearGradient(0xff0000, 0xff, 0, 0, 100, 100, true);
+
+        transform.scale(-1, 1);
+        g.fillLinearGradient(0xff0000, 0xff, 100, 100, 100, 100, true);
+        g.resetAffine();
+    }
+
+    @Override
+    protected String screenshotName() {
+        return "graphics-affine-scale";
+    }
+}

scripts/hellocodenameone/common/src/main/java/com/codenameone/examples/hellocodenameone/tests/graphics/DrawGradient.java

@@ -0,0 +1,33 @@
+package com.codenameone.examples.hellocodenameone.tests.graphics;
+
+import com.codename1.ui.EncodedImage;
+import com.codename1.ui.FontImage;
+import com.codename1.ui.Graphics;
+import com.codename1.ui.Image;
+import com.codename1.ui.RGBImage;
+import com.codename1.ui.geom.Rectangle;
+import com.codenameone.examples.hellocodenameone.tests.AbstractGraphicsScreenshotTest;
+
+public class DrawGradient extends AbstractGraphicsScreenshotTest {
+
+    @Override
+    protected void drawContent(Graphics g, Rectangle bounds) {
+        int height = bounds.getHeight() / 3;
+        int width = bounds.getWidth() / 2;
+        int y = bounds.getY();
+        g.fillRadialGradient(0xff, 0xff00, bounds.getX(), y, width, height);
+        g.fillRadialGradient(0xff, 0xff00, bounds.getX() + width, y, width, height,20, 200);
+        y += height;
+
+        g.fillRectRadialGradient(0xff0000, 0xcccccc, bounds.getX() + width, y, width, height,0.5f, 0.5f, 2);
+        g.fillLinearGradient(0xff, 0x999999, bounds.getX(), y, width, height, true);
+        y += height;
+
+        g.fillLinearGradient(0xff, 0x999999, bounds.getX(), y, width, height, false);
+    }
+
+    @Override
+    protected String screenshotName() {
+        return "graphics-draw-gradient";
+    }
+}

scripts/hellocodenameone/common/src/main/java/com/codenameone/examples/hellocodenameone/tests/graphics/DrawImage.java

@@ -1,6 +1,7 @@
 package com.codenameone.examples.hellocodenameone.tests.graphics;
 
 import com.codename1.ui.EncodedImage;
+import com.codename1.ui.FontImage;
 import com.codename1.ui.Graphics;
 import com.codename1.ui.Image;
 import com.codename1.ui.RGBImage;
@@ -14,10 +15,12 @@ public class DrawImage extends AbstractGraphicsScreenshotTest {
     private RGBImage rgbImage;
     private Image fromRgba;
     private Image fromBytes;
+    private FontImage fontImage;
+    private Image scaled;
 
     @Override
     protected void drawContent(Graphics g, Rectangle bounds) {
-        int size = bounds.getWidth() / 3;
+        int size = bounds.getWidth() / 4;
         if(mutable == null) {
             mutable = Image.createImage(size, size);
             Graphics mg = mutable.getGraphics();
@@ -30,6 +33,8 @@ protected void drawContent(Graphics g, Rectangle bounds) {
             rgbImage = new RGBImage(mutable);
             fromRgba = Image.createImage(rgbImage.getRGB(), size, size);
             fromBytes = Image.createImage(encoded.getImageData(), 0, encoded.getImageData().length);
+            fontImage = FontImage.createFixed("" + FontImage.MATERIAL_ALARM_ON, FontImage.getMaterialDesignFont(), 0xff0000, size, size, 2);
+            scaled = mutable.scaled(size * 2, size * 2).scaled(size, size);
         }
         int yBound = bounds.getY();
         g.drawImage(mutable, bounds.getX(), yBound);
@@ -39,10 +44,13 @@ protected void drawContent(Graphics g, Rectangle bounds) {
         g.drawImage(mutableWithAlpha, bounds.getX() + size, yBound);
 
         g.drawImage(encoded, bounds.getX() + size * 2, yBound);
+        g.drawImage(fontImage, bounds.getX() + size * 3, yBound);
+
         yBound = bounds.getY() + size;
         g.drawImage(rgbImage, bounds.getX(), yBound);
         g.drawImage(fromRgba, bounds.getX() + size, yBound);
         g.drawImage(fromBytes, bounds.getX() + size * 2, yBound);
+        g.drawImage(scaled, bounds.getX() + size * 3, yBound);
 
         int smallSize = size / 2;
         yBound = bounds.getY() + size * 2;
@@ -55,6 +63,8 @@ protected void drawContent(Graphics g, Rectangle bounds) {
         g.drawImage(rgbImage, bounds.getX() + smallSize * 3, yBound, smallSize, smallSize);
         g.drawImage(fromRgba, bounds.getX() + smallSize * 4, yBound, smallSize, smallSize);
         g.drawImage(fromBytes, bounds.getX() + smallSize * 5, yBound, smallSize, smallSize);
+        g.drawImage(fontImage, bounds.getX() + smallSize * 6, yBound, smallSize, smallSize);
+        g.drawImage(scaled, bounds.getX() + smallSize * 7, yBound, smallSize, smallSize);
         yBound += smallSize;
 
         int larger = bounds.getWidth() / 2;
@@ -70,6 +80,10 @@ protected void drawContent(Graphics g, Rectangle bounds) {
         yBound += larger;
         g.drawImage(fromRgba, bounds.getX(), yBound, larger, larger);
         g.drawImage(fromBytes, bounds.getX() + larger, yBound, larger, larger);
+
+        yBound += larger;
+        g.drawImage(fontImage, bounds.getX(), yBound, larger, larger);
+        g.drawImage(scaled, bounds.getX() + larger, yBound, larger, larger);
     }
 
     @Override

scripts/hellocodenameone/common/src/main/java/com/codenameone/examples/hellocodenameone/tests/graphics/DrawString.java

@@ -25,6 +25,9 @@ protected void drawContent(Graphics g, Rectangle bounds) {
             g.drawString(name, bounds.getX(), y);
             y += g.getFont().getHeight();
         }
+
+        g.setColor(0xff0000);
+        g.drawStringBaseline("Baseline and עברית", bounds.getX(), bounds.getY() + bounds.getHeight());
     }
 
     @Override