Exposed screenshot public API and added iOS implementation

Author: shai-almog

CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java

@@ -5699,6 +5699,7 @@ public void capturePhoto(ActionListener response) {
      *
      * @return An image of the screen, or null if it failed.
      * @since 7.0
+     * @deprecated replaced by screenshot()
      */
     public Image captureScreen() {
         Form form = getCurrentForm();

CodenameOne/src/com/codename1/testing/TestUtils.java

@@ -584,7 +584,8 @@ public static boolean screenshotTest(String screenshotName) {
                 return true;
             }
 
-            Image mute = Image.createImage(Display.getInstance().getDisplayWidth(), Display.getInstance().getDisplayHeight());
+
+            Image mute = Display.getInstance().captureScreen();
             Display.getInstance().getCurrent().paintComponent(mute.getGraphics(), true);
             screenshotName = screenshotName + ".png";
             if (Storage.getInstance().exists(screenshotName)) {

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

@@ -62,6 +62,7 @@
 import com.codename1.ui.util.ImageIO;
 import com.codename1.util.AsyncResource;
 import com.codename1.util.RunnableWithResultSync;
+import com.codename1.util.SuccessCallback;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -4995,12 +4996,25 @@ public void onCanInstallOnHomescreen(Runnable r) {
      *
      * @return An image of the screen, or null if it failed.
      * @since 7.0
+     * @deprecated use screenshot(SuccessCallback) instead
      */
     public Image captureScreen() {
         return impl.captureScreen();
     }
 
     /**
+     * Captures a screenshot in the native layer which should include peer
+     * components as well.
+     *
+     * @param callback will be invoked on the EDT with a screenshot
+     * @since 7.0.211
+     */
+    public void screenshot(SuccessCallback<Image> callback) {
+        impl.screenshot(callback);
+    }
+
+
+                           /**
      * Convenience method to schedule a task to run on the EDT after {@literal timeout}ms.
      *
      * @param timeout The timeout in milliseconds.

Ports/iOSPort/nativeSources/IOSNative.m

@@ -5193,6 +5193,47 @@ void com_codename1_impl_ios_IOSNative_updatePersonWithRecordID___int_com_codenam
 #endif
 }
 
+static UIImage* cn1_captureView(UIView *view) {
+    CGSize size = view.bounds.size;
+    if (size.width <= 0 || size.height <= 0) return nil;
+
+    // Prefer drawViewHierarchyInRect (renders with effects), fallback to CALayer
+    UIGraphicsBeginImageContextWithOptions(size, view.opaque, 0.0); // scale=0 → device scale
+    BOOL ok = NO;
+    if ([view respondsToSelector:@selector(drawViewHierarchyInRect:afterScreenUpdates:)]) {
+        ok = [view drawViewHierarchyInRect:view.bounds afterScreenUpdates:YES];
+    }
+    if (!ok) {
+        [view.layer renderInContext:UIGraphicsGetCurrentContext()];
+    }
+    UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return image;
+}
+
+void com_codename1_impl_ios_IOSNative_screenshot__(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject) {
+    /*dispatch_async(dispatch_get_main_queue(), ^{
+        UIView *view = [CodenameOne_GLViewController instance].view;
+        UIImage *img = cn1_captureView(view);
+        if (!img) {
+            return;
+        }
+
+        NSData *png = UIImagePNGRepresentation(img);
+        if (!png) {
+            return;
+        }
+
+        // Create Java byte[]
+        int len = (int)[png length];
+        JAVA_OBJECT byteArr = __NEW_ARRAY_JAVA_BYTE(CN1_THREAD_GET_STATE_PASS_ARG len);
+
+        memcpy((JAVA_ARRAY_BYTE*)((JAVA_ARRAY)byteArr)->data, (const jbyte*)[png bytes], len);
+
+        com_codename1_impl_ios_IOSImplementation_onScreenshot___byte_1ARRAY(CN1_THREAD_GET_STATE_PASS_ARG byteArr);
+    });*/
+}
+
 
 JAVA_LONG com_codename1_impl_ios_IOSNative_getPersonWithRecordID___int(CN1_THREAD_STATE_MULTI_ARG JAVA_OBJECT instanceObject, JAVA_INT recId) {
 #ifdef INCLUDE_CONTACTS_USAGE

Ports/iOSPort/src/com/codename1/impl/ios/IOSImplementation.java

@@ -33,6 +33,7 @@
 import com.codename1.location.Location;
 import com.codename1.ui.Component;
 import com.codename1.ui.Display;
+import com.codename1.ui.EncodedImage;
 import com.codename1.ui.Font;
 import com.codename1.ui.Image;
 import com.codename1.ui.PeerComponent;
@@ -300,6 +301,25 @@ public void addCookie(Cookie c) {
         }
     }
 
+    private static SuccessCallback<Image> screenshotCallback;
+
+    @Override
+    public void screenshot(SuccessCallback<Image> callback) {
+        screenshotCallback = callback;
+        nativeInstance.screenshot();
+    }
+
+    static void onScreenshot(final byte[] imageData) {
+        if(screenshotCallback != null) {
+            Display.getInstance().callSerially(new Runnable() {
+                @Override
+                public void run() {
+                    screenshotCallback.onSucess(EncodedImage.createImage(imageData));
+                }
+            });
+        }
+    }
+
     /**
      * Used to enable/disable native cookies from native code.
      * @param cookiesArray 

Ports/iOSPort/src/com/codename1/impl/ios/IOSNative.java

@@ -691,6 +691,7 @@ native void nativeSetTransformMutable(
     // We go through java in order to use locking concurrency
     native void appendData(long peer, long data);
 
+    native void screenshot();
 
     native void fillPolygonGlobal(int color, int alpha, int[] xPoints, int[] yPoints, int nPoints);