scoplan.camera 1.2.5 → 1.2.10

package/.github/instructions/snyk_rules.instructions.md

@@ -0,0 +1,14 @@
+---
+alwaysApply: true
+always_on: true
+trigger: always_on
+applyTo: "**"
+description: Snyk Security At Inception
+---
+
+# Project security best practices
+
+- Always run snyk_code_scan tool for new first party code that is generated in a Snyk-supported language.
+- If any security issues are found based on newly introduced or modified code or dependencies, attempt to fix the issues using the results context from Snyk.
+- Rescan the code after fixing the issues to ensure that the issues were fixed and that there are no newly introduced issues.
+- Repeat this process until no new issues are found.

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "snyk.advanced.autoSelectOrganization": true
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scoplan.camera",
-  "version": "1.2.5",
+  "version": "1.2.10",
   "description": "",
   "cordova": {
     "id": "scoplan.camera",

package/plugin.xml

@@ -65,7 +65,7 @@
 		<framework custom="true" src="src/android/gradle/scoplanCamera.gradle" type="gradleReference" />
 		<framework src="com.google.android.material:material:1.5.0-alpha02" />
 		<framework src="com.squareup.picasso:picasso:2.8" />
-		<framework src="io.sentry:sentry-android:7.2.0" />
+		<framework src="io.sentry:sentry-android:8.31.0" />
 		<framework src="androidx.constraintlayout:constraintlayout:2.1.4" />
 		<lib-file src="src/android/libs/ds-photo-editor-sdk-v9.aar" />
 	</platform>

package/src/android/CCropActivity.java

@@ -2,6 +2,12 @@ package scoplan.camera;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.View;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.dsphotoeditor.sdk.activity.DsPhotoEditorCropActivity;
 
@@ -13,5 +19,16 @@ public  class CCropActivity extends DsPhotoEditorCropActivity {
         int themeId = context.getResources().getIdentifier("AppTheme.NoActionBar", "style", context.getPackageName());
         setTheme(themeId);
         super.onCreate(savedInstanceState);
+
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        View rootView = findViewById(com.dsphotoeditor.sdk.R.id.ds_photo_editor_crop_root_layout);
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
     }
 }

package/src/android/CDrawActivity.java

@@ -2,6 +2,13 @@ package scoplan.camera;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.View;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.dsphotoeditor.sdk.activity.DsPhotoEditorDrawActivity;
 
 public class CDrawActivity extends DsPhotoEditorDrawActivity {
@@ -12,5 +19,16 @@ public class CDrawActivity extends DsPhotoEditorDrawActivity {
         int themeId = context.getResources().getIdentifier("AppTheme.NoActionBar", "style", context.getPackageName());
         setTheme(themeId);
         super.onCreate(savedInstanceState);
+
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        View rootView = findViewById(com.dsphotoeditor.sdk.R.id.ds_photo_editor_draw_root_layout);
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
     }
 }

package/src/android/CTextActivity.java

@@ -2,6 +2,13 @@ package scoplan.camera;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.View;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.dsphotoeditor.sdk.activity.DsPhotoEditorTextActivity;
 
 public class CTextActivity extends DsPhotoEditorTextActivity {
@@ -12,6 +19,17 @@ public class CTextActivity extends DsPhotoEditorTextActivity {
         int themeId = context.getResources().getIdentifier("AppTheme.NoActionBar", "style", context.getPackageName());
         setTheme(themeId);
         super.onCreate(savedInstanceState);
+
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        View rootView = findViewById(com.dsphotoeditor.sdk.R.id.ds_photo_editor_text_sticker_root_layout);
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
     }
 }
 

package/src/android/CameraFragment.java

@@ -31,6 +31,7 @@ import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
@@ -41,6 +42,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
 import android.util.Size;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.OrientationEventListener;
 import android.view.Surface;
@@ -66,6 +68,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
+import capacitor.cordova.android.plugins.R;
 import io.sentry.Sentry;
 
 public class CameraFragment extends Fragment implements scoplan.camera.OnImageCaptureListener, View.OnClickListener {
@@ -87,7 +90,7 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     private OrientationEventListener orientationEventListener;
     private CameraCaptureSession cameraCaptureSessions;
     private CaptureRequest.Builder captureRequestBuilder;
-    private String cameraId;
+    private String cameraId = null;
     private int CAMERA_REQUEST_PERMISSION = 5000;
     private Handler mBackgroundHandler;
     private HandlerThread mBackgroundThread;
@@ -101,17 +104,41 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     private int currentOrientation = -1;
     private boolean flashOn = false;
     private boolean cameraIsOpen = false;
-
+    private boolean previewReady = false;
     private SurfaceHolder mSurfaceHolder;
 
     private boolean surfaceAvailable = false;
+    private boolean surfaceSizeConfigured = false;
+    private Size optimalPreviewSize = null;
     private LinearLayout cameraFrameLayout;
+    private boolean callbackAdded = false;
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (!callbackAdded) {
+            mSurfaceHolder.addCallback(surfaceHolderCallBack);
+            callbackAdded = true;
+        }
+
+        // Apply window insets to root view to handle system bars
+        androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(view, (v, windowInsets) -> {
+            androidx.core.graphics.Insets insets = windowInsets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars());
+
+            // Apply padding to root view
+            v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+
+            return androidx.core.view.WindowInsetsCompat.CONSUMED;
+        });
+    }
 
     private final SurfaceHolder.Callback surfaceHolderCallBack = new SurfaceHolder.Callback() {
         @Override
         public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder) {
             surfaceAvailable = true;
-            openCamera();
+            if(!cameraIsOpen) {
+                openCamera();
+            }
         }
 
         @Override
@@ -121,8 +148,8 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
 
         @Override
         public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder) {
-            //TODO close
             surfaceAvailable = false;
+            surfaceSizeConfigured = false;
             release();
         }
     };
@@ -132,19 +159,24 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         public void onOpened(@NonNull CameraDevice camera) {
             cameraDevice = camera;
             cameraIsOpen = true;
-            createCameraPreview();
+            // Configure surface size first; surfaceChanged will trigger createCameraPreview
+            configureSurfaceSize();
         }
 
         @Override
-        public void onDisconnected(@NonNull CameraDevice cameraDevice) {
-            cameraDevice.close();
+        public void onDisconnected(@NonNull CameraDevice camera) {
             cameraIsOpen = false;
+            previewReady = false;
+            surfaceSizeConfigured = false;
             release();
         }
 
         @Override
-        public void onError(@NonNull CameraDevice cameraDevice, int i) {
-            cameraDevice.close();
+        public void onError(@NonNull CameraDevice camera, int error) {
+            Log.e(SCOPLAN_TAG, "CameraDevice.StateCallback onError: " + error);
+            cameraIsOpen = false;
+            previewReady = false;
+            surfaceSizeConfigured = false;
             release();
         }
     };
@@ -198,13 +230,29 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
             }
         };
 
-        this.fakeR = new FakeR(getContext());
+        this.fakeR = new FakeR(requireActivity());
+    }
+
+    private int findStyleResId(Context context, String styleName) {
+        // Convert dotted names (AppTheme.NoActionBar) to compiled names (AppTheme_NoActionBar)
+        String compiledName = styleName.replace('.', '_');
+
+        int resId = context.getResources().getIdentifier(
+            compiledName,
+            "style",
+            context.getPackageName()
+        );
+
+        return resId;
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(LayoutInflater outerInflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
+        int themeId = getActivity().getResources().getIdentifier("AppTheme.fullscreen", "style", getActivity().getPackageName());
+        ContextThemeWrapper themeContext = new ContextThemeWrapper(requireActivity(), themeId);
+        LayoutInflater inflater = outerInflater.cloneInContext(themeContext);
         View view =  inflater.inflate(this.fakeR.getLayout("fragment_camera"), container, false);
         camButton = view.findViewById(this.fakeR.getId("button_capture"));
         zoomBar = view.findViewById(this.fakeR.getId("camera_zoom"));
@@ -217,7 +265,6 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         drawOn = view.findViewById(this.fakeR.getId("draw_on"));
         assert surfaceView != null;
         mSurfaceHolder = surfaceView.getHolder();
-        mSurfaceHolder.addCallback(surfaceHolderCallBack);
         souche = view.findViewById(this.fakeR.getId("image_souche"));
         cameraTopBar = view.findViewById(this.fakeR.getId("cameraTopBar"));
         cancelBtn = view.findViewById(this.fakeR.getId("cancel"));
@@ -233,51 +280,113 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         validationButton.setOnClickListener(this);
         flashBtn.setOnClickListener(this);
         this.defineViewVisibility();
+
         return view;
     }
 
+    private void configureSurfaceSize() {
+        if (cameraId == null || getActivity() == null) {
+            // Can't configure yet, fall back to direct preview
+            surfaceSizeConfigured = true;
+            createCameraPreview();
+            return;
+        }
+        try {
+            CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId);
+            StreamConfigurationMap map = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+            if (map != null) {
+                Size[] outputSizes = map.getOutputSizes(SurfaceTexture.class);
+                optimalPreviewSize = selectedPreviewSize(outputSizes);
+                if (optimalPreviewSize != null && cameraFrameLayout.getWidth() > 0) {
+                    Size displaySize = calculateSurfaceSize(optimalPreviewSize);
+                    getActivity().runOnUiThread(() -> {
+                        if (!isAdded()) return;
+                        ViewGroup.LayoutParams layoutParams = surfaceView.getLayoutParams();
+                        boolean sizeChanged = layoutParams.width != displaySize.getWidth()
+                                || layoutParams.height != displaySize.getHeight();
+                        layoutParams.width = displaySize.getWidth();
+                        layoutParams.height = displaySize.getHeight();
+                        surfaceView.setLayoutParams(layoutParams);
+                        // Set buffer to camera native resolution
+                        mSurfaceHolder.setFixedSize(optimalPreviewSize.getWidth(), optimalPreviewSize.getHeight());
+                        surfaceSizeConfigured = true;
+                        // If size didn't change, surfaceChanged won't fire, so call createCameraPreview directly
+                        if (!sizeChanged) {
+                            createCameraPreview();
+                        }
+                        // Otherwise surfaceChanged will be called → createCameraPreview
+                    });
+                    return;
+                }
+            }
+        } catch (Exception e) {
+            Log.e(SCOPLAN_TAG, "Error configuring surface size", e);
+        }
+        // Fallback: proceed directly
+        surfaceSizeConfigured = true;
+        createCameraPreview();
+    }
+
     private void createCameraPreview() {
-        if(cameraDevice == null || !surfaceAvailable)
+        if(cameraDevice == null || !surfaceAvailable || previewReady || !surfaceSizeConfigured)
             return;
         if(!cameraIsOpen) {
             this.openCamera();
+            return;
         }
+        previewReady = true;
         try{
+            // Close any existing session before creating a new one
+            closeSession();
+
             Surface surface = mSurfaceHolder.getSurface();
             captureRequestBuilder = cameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
             captureRequestBuilder.addTarget(surface);
             cameraDevice.createCaptureSession(Arrays.asList(surface), new CameraCaptureSession.StateCallback() {
                 @Override
                 public void onConfigured(@NonNull CameraCaptureSession cameraCaptureSession) {
-                    if(cameraDevice == null)
+                    if(cameraDevice == null) {
+                        previewReady = false;
                         return;
+                    }
                     cameraCaptureSessions = cameraCaptureSession;
                     updatePreview();
                 }
 
                 @Override
                 public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) {
-                    Sentry.captureMessage(cameraCaptureSession.toString());
+                    Log.e(SCOPLAN_TAG, "onConfigureFailed for preview session");
+                    Sentry.captureMessage("onConfigureFailed: " + cameraCaptureSession.toString());
+                    previewReady = false;
+                    failedCapture();
                 }
-            },null);
+            }, mBackgroundHandler);
         } catch (Exception e) {
+            Log.e(SCOPLAN_TAG, "Error creating camera preview", e);
             Sentry.captureException(e);
+            previewReady = false;
             this.failedCapture();
         }
     }
 
     private void openCamera() {
         try{
+            if (cameraId != null ) {
+                return;
+            }
             for (String id : manager.getCameraIdList()) {
                 CameraCharacteristics cameraCharacteristics =
                     manager.getCameraCharacteristics(id);
-                if (cameraCharacteristics.get(cameraCharacteristics.LENS_FACING) ==
+                if (cameraCharacteristics.get(CameraCharacteristics.LENS_FACING) ==
                     CameraCharacteristics.LENS_FACING_BACK) {
                     cameraId = id;
                     break;
                 }
             }
-            cameraId = manager.getCameraIdList()[0];
+            // Fallback to first camera only if no back camera was found
+            if (cameraId == null) {
+                cameraId = manager.getCameraIdList()[0];
+            }
             CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId);
             StreamConfigurationMap map = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
             assert map != null;
@@ -310,28 +419,9 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     }
 
     private void updatePreview() {
-        if(cameraDevice == null)
-            Log.e(SCOPLAN_TAG, "Error camera");
-        captureRequestBuilder.set(CaptureRequest.CONTROL_MODE,CaptureRequest.CONTROL_MODE_AUTO);
-        try{
-            CameraCharacteristics cameraCharacteristics =
-                manager.getCameraCharacteristics(cameraId);
-            StreamConfigurationMap map = cameraCharacteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-            if(map != null) {
-                Size[] outputSizes = map.getOutputSizes(SurfaceTexture.class);
-                Size preferredSize = selectedPreviewSize(outputSizes);
-                if(preferredSize != null) {
-                    ViewGroup.LayoutParams layoutParams = surfaceView.getLayoutParams();
-                    Size surfaceSize = calculateSurfaceSize(preferredSize);
-                    getActivity().runOnUiThread(() -> {
-                        layoutParams.width = surfaceSize.getWidth();
-                        layoutParams.height = surfaceSize.getHeight();
-                        mSurfaceHolder.setFixedSize(surfaceSize.getWidth(), surfaceSize.getHeight());
-                        surfaceView.setLayoutParams(layoutParams);
-                    });
-                }
-            }
-            cameraCaptureSessions.setRepeatingRequest(captureRequestBuilder.build(),null, mBackgroundHandler);
+        captureRequestBuilder.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_MODE_AUTO);
+        try {
+            cameraCaptureSessions.setRepeatingRequest(captureRequestBuilder.build(), null, mBackgroundHandler);
             this.cameraSeekBarListener = new scoplan.camera.CameraSeekBarListener(cameraId, manager, zoomBar, captureRequestBuilder, cameraCaptureSessions, mBackgroundHandler);
         } catch (Exception e) {
             Sentry.captureException(e);
@@ -341,23 +431,54 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
 
     private Size calculateSurfaceSize(Size selectedSize) {
         int parentWidth = this.cameraFrameLayout.getWidth();
-        Size correctSize = new Size(selectedSize.getHeight(), selectedSize.getWidth()); // We are in portrait mode
+        int parentHeight = this.cameraFrameLayout.getHeight();
+
+        // Camera sensor is landscape, but we display in portrait → swap W/H
+        float previewAspectRatio = (float) selectedSize.getHeight() / selectedSize.getWidth();
 
-        float aspectRatio = (float) correctSize.getWidth() / correctSize.getHeight();
+        // Center-crop: fill the entire parent, crop overflow (no distortion)
+        int surfaceWidth, surfaceHeight;
+        int fitWidth = parentWidth;
+        int fitHeight = (int) (parentWidth / previewAspectRatio);
+
+        if (fitHeight >= parentHeight) {
+            // Fit by width already fills the height — use it
+            surfaceWidth = fitWidth;
+            surfaceHeight = fitHeight;
+        } else {
+            // Fit by height and let width overflow
+            surfaceHeight = parentHeight;
+            surfaceWidth = (int) (parentHeight * previewAspectRatio);
+        }
 
-        int height = (int) (parentWidth / aspectRatio);
-        return new Size(parentWidth, height);
+        return new Size(surfaceWidth, surfaceHeight);
     }
 
     private Size selectedPreviewSize(Size[] outputSizes) {
-        float targetAspectRatio = 1f; // For example, 16:9 aspect ratio
-        // Choose a suitable size from outputSizes based on the aspect ratio
+        // Target 4:3 aspect ratio (landscape sensor: width > height, so 4/3 ≈ 1.333)
+        float targetAspectRatio = 4f / 3f;
         Size selectedSize = null;
+        int bestArea = 0;
+
         for (Size size : outputSizes) {
             float aspectRatio = (float) size.getWidth() / size.getHeight();
-            if (Math.abs(aspectRatio - targetAspectRatio) < 0.1) {
-                selectedSize = size;
-                break;
+            if (Math.abs(aspectRatio - targetAspectRatio) < 0.05) {
+                // Among matching ratios, pick the largest for best quality
+                int area = size.getWidth() * size.getHeight();
+                if (area > bestArea) {
+                    bestArea = area;
+                    selectedSize = size;
+                }
+            }
+        }
+
+        // Fallback: if no 4:3, pick the largest size available
+        if (selectedSize == null && outputSizes.length > 0) {
+            selectedSize = outputSizes[0];
+            for (Size size : outputSizes) {
+                if (size.getWidth() * size.getHeight() > selectedSize.getWidth() * selectedSize.getHeight()) {
+                    selectedSize = size;
+                }
             }
         }
         return selectedSize;
@@ -367,23 +488,22 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     public void onResume() {
         super.onResume();
         startBackgroundThread();
-        if(surfaceAvailable)
+        if(surfaceAvailable && !cameraIsOpen) {
             openCamera();
-        else {
-            mSurfaceHolder.addCallback(surfaceHolderCallBack);
         }
         this.orientationEventListener.enable();
 
         Window window = requireActivity().getWindow();
 
+        // Enable edge-to-edge mode but keep system bars visible
+        WindowCompat.setDecorFitsSystemWindows(window, false);
+
         WindowInsetsControllerCompat controller =
             WindowCompat.getInsetsController(window, window.getDecorView());
 
         if (controller != null) {
-            controller.hide(WindowInsets.Type.statusBars());
-            controller.setSystemBarsBehavior(
-                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            );
+            // Show status and navigation bars
+            controller.show(WindowInsets.Type.systemBars());
         }
     }
 
@@ -393,11 +513,15 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         super.onPause();
         this.orientationEventListener.disable();
         Window window = requireActivity().getWindow();
+
+        // Restore normal window mode when leaving camera
+        WindowCompat.setDecorFitsSystemWindows(window, true);
+
         WindowInsetsControllerCompat controller =
             WindowCompat.getInsetsController(window, window.getDecorView());
 
         if (controller != null) {
-            controller.show(WindowInsets.Type.statusBars());
+            controller.show(WindowInsets.Type.systemBars());
         }
         release();
     }
@@ -408,23 +532,45 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         release();
     }
 
+    private void closeSession() {
+        if(cameraCaptureSessions != null) {
+            try {
+                cameraCaptureSessions.close();
+            } catch (Exception e) {
+                Log.e(SCOPLAN_TAG, "Error closing capture session", e);
+            }
+            cameraCaptureSessions = null;
+        }
+    }
+
     private void release() {
+        closeSession();
         if(cameraDevice != null) {
-            cameraDevice.close();
+            try {
+                cameraDevice.close();
+            } catch (Exception e) {
+                Log.e(SCOPLAN_TAG, "Error closing camera device", e);
+            }
             cameraIsOpen = false;
+            previewReady = false;
+            surfaceSizeConfigured = false;
             cameraDevice = null;
+            cameraId = null;
         }
     }
 
     private void stopBackgroundThread() {
+        if (mBackgroundThread == null) {
+            return;
+        }
         mBackgroundThread.quitSafely();
         try{
             mBackgroundThread.join();
-            mBackgroundThread= null;
-            mBackgroundHandler = null;
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            Log.e(SCOPLAN_TAG, "Error stopping background thread", e);
         }
+        mBackgroundThread = null;
+        mBackgroundHandler = null;
     }
 
     private void startBackgroundThread() {
@@ -442,15 +588,18 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
     }
 
     private void takePicture() {
+        if(getContext() == null) {
+            return;
+        }
         if(this.pictureCount >= this.photoLimit){
             Toast toast = Toast.makeText(this.getContext(), "La prise de photos est limitée à " + this.photoLimit + " par envoi", Toast.LENGTH_SHORT);
             toast.show();
             return;
         }
-        if(this.mBackgroundThread == null || !this.mBackgroundThread.isInterrupted() || !this.mBackgroundThread.isAlive()) {
+        if(this.mBackgroundThread == null || !this.mBackgroundThread.isAlive()) {
             this.startBackgroundThread();
         }
-        if(cameraDevice == null) {
+        if(cameraDevice == null || cameraId == null) {
             return;
         }
         this.pictureCount++;
@@ -459,9 +608,12 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
         try {
             CameraCharacteristics characteristics = manager.getCameraCharacteristics(cameraId);
             Size[] jpegSizes = null;
-            if(characteristics != null)
-                jpegSizes = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)
-                    .getOutputSizes(ImageFormat.JPEG);
+            if(characteristics != null) {
+                StreamConfigurationMap map = characteristics.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+                if (map != null) {
+                    jpegSizes = map.getOutputSizes(ImageFormat.JPEG);
+                }
+            }
             //Capture image with custom size
             int width = 640;
             int height = 480;
@@ -470,7 +622,7 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
                 width = jpegSizes[0].getWidth();
                 height = jpegSizes[0].getHeight();
             }
-            final ImageReader reader = ImageReader.newInstance(width, height, ImageFormat.JPEG,1);
+            final ImageReader reader = ImageReader.newInstance(width, height, ImageFormat.JPEG, 1);
             List<Surface> outputSurface = new ArrayList<>(2);
             outputSurface.add(reader.getSurface());
             outputSurface.add(mSurfaceHolder.getSurface());
@@ -480,7 +632,7 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
             captureBuilder.set(CaptureRequest.FLASH_MODE, flashOn ? CaptureRequest.FLASH_MODE_TORCH : CaptureRequest.FLASH_MODE_OFF);
             String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
             String fileName = "IMG_"+ timeStamp + ".jpg";
-            File file = new File( this.getContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES), fileName);
+            File file = new File(this.getContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES), fileName);
             ImageReader.OnImageAvailableListener readerListener = new scoplan.camera.ImageCameraAvailableListener(file, reader, this, currentOrientation);
 
             reader.setOnImageAvailableListener(readerListener, mBackgroundHandler);
@@ -488,14 +640,18 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
                 @Override
                 public void onCaptureCompleted(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull TotalCaptureResult result) {
                     super.onCaptureCompleted(session, request, result);
+                    reader.close();
+                    previewReady = false;
                     createCameraPreview();
                 }
 
                 @Override
                 public void onCaptureFailed(@NonNull CameraCaptureSession session, @NonNull CaptureRequest request, @NonNull CaptureFailure failure) {
                     super.onCaptureFailed(session, request, failure);
+                    reader.close();
                     Sentry.captureMessage("Failed capture _" + failure.getReason());
                     Log.e(SCOPLAN_TAG, "Error FAILED Capture " + failure.getReason());
+                    pictureCount--;
                     failedCapture();
                 }
             };
@@ -508,43 +664,59 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
                     } catch (Exception e) {
                         Log.e(SCOPLAN_TAG, "Error - " + e.getMessage());
                         Sentry.captureException(e);
+                        reader.close();
+                        pictureCount--;
                         failedCapture();
                     }
                 }
 
                 @Override
                 public void onConfigureFailed(@NonNull CameraCaptureSession cameraCaptureSession) {
-                    Log.e(SCOPLAN_TAG, "Error FAILED Configuration ");
-                    Sentry.captureMessage("Failed configure cameraCaptureSession");
+                    Log.e(SCOPLAN_TAG, "Error FAILED Configuration for capture session");
+                    Sentry.captureMessage("Failed configure capture session");
+                    reader.close();
+                    pictureCount--;
                     failedCapture();
                 }
             }, mBackgroundHandler);
 
         } catch (Exception e) {
+            Log.e(SCOPLAN_TAG, "Error in takePicture", e);
             Sentry.captureException(e);
-            throw new RuntimeException(e);
+            pictureCount--;
+            failedCapture();
         }
     }
 
     @Override
     public void onImageCapture(File file, Bitmap bitmap) {
         pictures.add(file.getAbsolutePath());
-        getActivity().runOnUiThread(() -> {
-            souche.setImageBitmap(bitmap);
-            defineViewVisibility();
-        });
+        if (getActivity() != null && isAdded()) {
+            getActivity().runOnUiThread(() -> {
+                if (isAdded()) {
+                    souche.setImageBitmap(bitmap);
+                    defineViewVisibility();
+                }
+            });
+        }
     }
 
     @Override
     public void onImageBuildFailed(Exception e) {
         Sentry.captureException(e);
+        pictureCount--;
         failedCapture();
     }
 
     public void failedCapture() {
-        Toast toast = Toast.makeText(getContext(), "Oups! une erreur pendant la capture. Veuillez rééssayer.", Toast.LENGTH_LONG);
-        toast.show();
+        if (getActivity() == null || !isAdded()) {
+            return;
+        }
         getActivity().runOnUiThread(() -> {
+            if (!isAdded() || getContext() == null) {
+                return;
+            }
+            Toast.makeText(getContext(), "Oups! une erreur pendant la capture. Veuillez rééssayer.", Toast.LENGTH_LONG).show();
             defineViewVisibility();
         });
     }

package/src/android/ImageCameraAvailableListener.java

@@ -29,33 +29,43 @@ public class ImageCameraAvailableListener implements ImageReader.OnImageAvailabl
         Image image = null;
         try{
             image = reader.acquireLatestImage();
+            if (image == null) {
+                this.imageCaptureListener.onImageBuildFailed(new IOException("Failed to acquire image"));
+                return;
+            }
             ByteBuffer buffer = image.getPlanes()[0].getBuffer();
             byte[] bytes = new byte[buffer.capacity()];
             buffer.get(bytes);
             this.imageCaptureListener.onImageCapture(file, save(bytes));
         }
-        catch (IOException e)
+        catch (Exception e)
         {
             e.printStackTrace();
             this.imageCaptureListener.onImageBuildFailed(e);
         }
         finally {
-            {
-                if(image != null)
-                    image.close();
-            }
+            if(image != null)
+                image.close();
         }
     }
 
     private Bitmap save(byte[] bytes) throws IOException {
         OutputStream outputStream = null;
+        Bitmap bmp = null;
         try{
             outputStream = new FileOutputStream(file);
-            Bitmap bmp = BitmapFactory.decodeByteArray(bytes,0, bytes.length);
+            bmp = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+            if (bmp == null) {
+                throw new IOException("Failed to decode image bytes");
+            }
             Matrix matrix = new Matrix();
             matrix.setRotate(this.rotation);
             Bitmap rotatedBitmap = Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), matrix, true);
             rotatedBitmap.compress(Bitmap.CompressFormat.JPEG, 65, outputStream);
+            // Recycle original bitmap only if rotation created a new one
+            if (rotatedBitmap != bmp) {
+                bmp.recycle();
+            }
             return rotatedBitmap;
         } finally {
             if(outputStream != null)

package/src/android/PhotoEditorActivity.java

@@ -13,6 +13,11 @@ import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
+
 import com.dsphotoeditor.sdk.activity.DsPhotoEditorActivity;
 
 import java.io.File;
@@ -28,6 +33,10 @@ public class PhotoEditorActivity extends DsPhotoEditorActivity {
         int themeId = context.getResources().getIdentifier("AppTheme.NoActionBar", "style", context.getPackageName());
         setTheme(themeId);
         super.onCreate(savedInstanceState);
+
+        // Enable edge-to-edge and handle system bars
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
         this.fakeR = new FakeR(this);
         this.e = this.getIntent().getData();
         if (this.e == null) {
@@ -36,6 +45,16 @@ public class PhotoEditorActivity extends DsPhotoEditorActivity {
         } else {
             this.createBottomBar(savedInstanceState);
         }
+
+        // Apply window insets to root layout
+        View rootView = findViewById(fakeR.getId("ds_photo_editor_root_layout"));
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
     }
 
     @SuppressLint("ResourceType")

package/src/android/PhotoEditorMesureCustomActivity.java

@@ -1,6 +1,10 @@
 package scoplan.camera;
 
 import androidx.core.content.ContextCompat;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import android.app.AlertDialog;
 import android.content.Context;
@@ -53,6 +57,18 @@ public class PhotoEditorMesureCustomActivity extends DsPhotoEditorTextActivity i
         super.onCreate(var1);
         this.fakeR = new FakeR(this);
         this.setContentView(com.dsphotoeditor.sdk.R.layout.activity_ds_photo_editor_sticker_text);
+
+        WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
+
+        View rootView = findViewById(com.dsphotoeditor.sdk.R.id.ds_photo_editor_text_sticker_root_layout);
+        if (rootView != null) {
+            ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+                Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+                v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+                return WindowInsetsCompat.CONSUMED;
+            });
+        }
+
         if (original != null && !original.isRecycled()) {
             this.a();
             this.b();

package/src/android/ScoplanCamera.java

@@ -1,5 +1,6 @@
 package scoplan.camera;
 
+import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.widget.FrameLayout;
 
@@ -38,20 +39,21 @@ public class ScoplanCamera extends CordovaPlugin implements CameraEventListener
 
     private void takePictures(int limit, int currentCount) {
         cordova.getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-        CameraEventListener cameraEventListener = this;
+        scoplan.camera.CameraEventListener cameraEventListener = this;
         cordova.getActivity().runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 containerView = (FrameLayout)cordova.getActivity().findViewById(containerViewId);
                 if(containerView == null){
-                    containerView = new FrameLayout(cordova.getActivity().getApplicationContext());
+                    Context context = cordova.getActivity();
+                    containerView = new FrameLayout(context);
                     containerView.setId(containerViewId);
                     FrameLayout.LayoutParams containerLayoutParams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
                     cordova.getActivity().addContentView(containerView, containerLayoutParams);
                     //add the fragment to the container
                 }
                 containerView.setClickable(true);
-                cameraFragment = new CameraFragment();
+                cameraFragment = new scoplan.camera.CameraFragment();
                 if(currentCount > 0){
                     cameraFragment.setCurrentCount(currentCount);
                 }

package/src/android/res/layout/fragment_camera.xml

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/shape_rectangle">
+    android:background="#000000">
     <LinearLayout
         android:id="@+id/camera_frame_layout"
         android:layout_width="match_parent"

package/src/ios/ScoplanCamera.m

@@ -79,6 +79,11 @@
         [imagePreview setImage:nil];
         UIView* view = [self.cameraUI.cameraOverlayView viewWithTag:11];
         [view setHidden:YES];
+        // No more photos: button back to "X"
+        UIButton* cancelBtn = (UIButton *)[self.cameraUI.cameraOverlayView viewWithTag:2];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [cancelBtn setTitle:@"X" forState:UIControlStateNormal];
+        });
     }
 }
 
@@ -87,9 +92,23 @@
 }
 
 - (void)insertPicture:(NSString*)url{
-    UIView* view = [self.cameraUI.cameraOverlayView viewWithTag:11];
-    [view setHidden:NO];
+    UIView* topBar = [self.cameraUI.cameraOverlayView viewWithTag:11];
     [mpictures addObject:url];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        UIButton* cancelBtn = (UIButton *)[self.cameraUI.cameraOverlayView viewWithTag:2];
+        [cancelBtn setTitle:@"OK" forState:UIControlStateNormal];
+
+        // Position top bar below safe area
+        CGFloat safeTop = 0;
+        if (@available(iOS 11.0, *)) {
+            safeTop = self.cameraUI.view.safeAreaInsets.top;
+        }
+        if (safeTop < 20) safeTop = 20;
+        CGFloat screenWidth = [[UIScreen mainScreen] bounds].size.width;
+        CGFloat barHeight = 44.0;
+        topBar.frame = CGRectMake(0, safeTop, screenWidth, barHeight);
+        [topBar setHidden:NO];
+    });
 }
 
 - (void)flushPicture:(NSString*)url{
@@ -134,7 +153,7 @@
             UIButton *cancelBtn = (UIButton *)[self.overLayView viewWithTag:2];
             UIButton *cancelBtn2 = (UIButton *)[self.overLayView viewWithTag:12];
             dispatch_async( dispatch_get_main_queue(), ^{
-                 [cancelBtn setTitle:@"Annuler" forState:UIControlStateNormal];
+                 [cancelBtn setTitle:@"X" forState:UIControlStateNormal];
             });
             [cancelBtn addTarget: self action: @selector(cancelClicked:) forControlEvents: UIControlEventTouchUpInside];
             [cancelBtn2 addTarget: self action: @selector(cancelConfirm:) forControlEvents: UIControlEventTouchUpInside];
@@ -167,11 +186,44 @@
     self.cameraUI.allowsEditing = NO;
     self.cameraUI.delegate = delegate;
     self.overLayView.frame = self.cameraUI.cameraOverlayView.frame;
+    self.overLayView.backgroundColor = [UIColor clearColor];
     self.cameraUI.cameraOverlayView = self.overLayView;
-    float camHeight = ([[UIScreen mainScreen] bounds].size.height/2)*15/100;
     UIImageView * imagePreview = ((UIImageView *)[self.overLayView viewWithTag:3]);
     [self.cameraUI initData:imagePreview mCamera:self];
-    self.cameraUI.cameraViewTransform = CGAffineTransformTranslate(self.cameraUI.cameraViewTransform, 0, camHeight);
+
+    // Scale camera preview to fill from safe-area-top to bottom of screen
+    CGFloat screenHeight = [[UIScreen mainScreen] bounds].size.height;
+    CGFloat screenWidth  = [[UIScreen mainScreen] bounds].size.width;
+    CGFloat safeTop = 0;
+    if (@available(iOS 11.0, *)) {
+        UIWindow *window = UIApplication.sharedApplication.keyWindow;
+        if (window) safeTop = window.safeAreaInsets.top;
+    }
+    if (safeTop < 20) safeTop = 20;
+    CGFloat visibleHeight = screenHeight - safeTop;
+    CGFloat cameraPreviewHeight = screenWidth * 4.0 / 3.0;
+    CGFloat scale = visibleHeight / cameraPreviewHeight;
+    if (scale < 1.0) scale = 1.0;
+    // Translate the scaled preview down so its top aligns with safe-area-top
+    CGFloat translateY = safeTop / 2.0 + (visibleHeight - cameraPreviewHeight) / 2.0;
+    CGAffineTransform scaleTransform = CGAffineTransformMakeScale(scale, scale);
+    CGAffineTransform translateTransform = CGAffineTransformMakeTranslation(0, translateY);
+    self.cameraUI.cameraViewTransform = CGAffineTransformConcat(scaleTransform, translateTransform);
+
+    // Add a black bar covering the safe-area-top (behind status bar)
+    UIView *statusBarBg = [[UIView alloc] initWithFrame:CGRectMake(0, 0, screenWidth, safeTop)];
+    statusBarBg.backgroundColor = [UIColor blackColor];
+    statusBarBg.tag = 98;
+    [self.overLayView addSubview:statusBarBg];
+    [self.overLayView sendSubviewToBack:statusBarBg];
+
+    // Switch top bar (tag=11) to frame-based positioning so we can place it below safe area
+    UIView *topBar = [self.overLayView viewWithTag:11];
+    if (topBar) {
+        topBar.translatesAutoresizingMaskIntoConstraints = YES;
+        topBar.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin;
+    }
+
     [controller presentViewController:self.cameraUI animated:YES completion:nil];
     return YES;
 }

package/src/ios/ScoplanCamera.storyboard

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,41 +16,51 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dph-cD-OZJ" userLabel="Preview" customClass="AVCamPreviewView">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="862"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="828"/>
+                                <color key="backgroundColor" white="0" alpha="1" colorSpace="calibratedWhite"/>
                                 <gestureRecognizers/>
                                 <connections>
                                     <outletCollection property="gestureRecognizers" destination="Wqi-ea-KMR" appends="YES" id="oAd-i0-IMA"/>
                                 </connections>
                             </view>
-                            <view alpha="0.25" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jGC-3L-9Um" userLabel="black">
-                                <rect key="frame" x="0.0" y="735" width="414" height="127"/>
-                                <color key="backgroundColor" systemColor="viewFlipsideBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="jGC-3L-9Um" secondAttribute="height" multiplier="160:49" id="YuY-vB-8QI"/>
-                                </constraints>
-                            </view>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="lmm-Ty-vl6" userLabel="imageview">
-                                <rect key="frame" x="20" y="787" width="50" height="50"/>
+                                <rect key="frame" x="20" y="753" width="50" height="50"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="GxG-7V-98h"/>
                                     <constraint firstAttribute="height" constant="50" id="j8A-7b-Pdm"/>
                                 </constraints>
                             </imageView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nqA-FF-aMJ">
-                                <rect key="frame" x="275.5" y="797" width="53" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nqA-FF-aMJ">
+                                <rect key="frame" x="350" y="756" width="44" height="44"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="1gH-LF-9jk"/>
+                                    <constraint firstAttribute="height" constant="44" id="1gH-LF-9jk"/>
+                                    <constraint firstAttribute="width" constant="44" id="nqA-w-44w"/>
                                 </constraints>
-                                <state key="normal" title="Annuler">
-                                    <color key="titleColor" red="1" green="1" blue="0.10045030381944445" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" red="0.6" green="0.6" blue="0.6" alpha="0.8" colorSpace="calibratedRGB"/>
+                                <state key="normal" title="X">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <real key="value" value="22"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds">
+                                        <boolean key="value" value="YES"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
+                                        <real key="value" value="2"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="layer.borderColor">
+                                        <color key="value" white="0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="backtowebview:" destination="AA8-Jf-iAm" eventType="touchUpInside" id="8HQ-lG-VyA"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cRf-Sp-1y2">
-                                <rect key="frame" x="182" y="787" width="50" height="50"/>
+                                <rect key="frame" x="182" y="753" width="50" height="50"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="3uF-tj-9po"/>
                                     <constraint firstAttribute="width" secondItem="cRf-Sp-1y2" secondAttribute="height" multiplier="1:1" id="jhA-cY-Fs5"/>
@@ -63,7 +72,7 @@
                                 </connections>
                             </button>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="YrK-DJ-ony">
-                                <rect key="frame" x="182" y="787" width="50" height="50"/>
+                                <rect key="frame" x="182" y="753" width="50" height="50"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="1ap-FV-bAg"/>
                                     <constraint firstAttribute="width" constant="50" id="8dJ-8K-RdS"/>
@@ -71,27 +80,23 @@
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="jij-t7-zCY"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" white="0" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="jij-t7-zCY" firstAttribute="bottom" secondItem="YrK-DJ-ony" secondAttribute="bottom" constant="25" id="0MC-Rx-Lgu"/>
-                            <constraint firstItem="jGC-3L-9Um" firstAttribute="leading" secondItem="jij-t7-zCY" secondAttribute="leading" id="3iI-5o-Y21"/>
                             <constraint firstItem="YrK-DJ-ony" firstAttribute="centerX" secondItem="8ze-qw-dRA" secondAttribute="centerX" id="56H-C7-K1g"/>
-                            <constraint firstItem="Dph-cD-OZJ" firstAttribute="bottom" secondItem="jij-t7-zCY" secondAttribute="bottom" id="Bla-Mv-ywP"/>
+                            <constraint firstItem="Dph-cD-OZJ" firstAttribute="bottom" secondItem="8ze-qw-dRA" secondAttribute="bottom" id="Bla-Mv-ywP"/>
                             <constraint firstItem="cRf-Sp-1y2" firstAttribute="centerX" secondItem="8ze-qw-dRA" secondAttribute="centerX" id="IwK-Lt-F2A"/>
                             <constraint firstItem="Dph-cD-OZJ" firstAttribute="leading" secondItem="8ze-qw-dRA" secondAttribute="leading" id="ZPE-Xb-bhT"/>
                             <constraint firstItem="jij-t7-zCY" firstAttribute="bottom" secondItem="cRf-Sp-1y2" secondAttribute="bottom" constant="25" id="d7J-t5-TqX"/>
                             <constraint firstAttribute="trailing" secondItem="Dph-cD-OZJ" secondAttribute="trailing" id="owy-xt-NSQ"/>
                             <constraint firstItem="Dph-cD-OZJ" firstAttribute="top" secondItem="8ze-qw-dRA" secondAttribute="top" id="pfp-tG-hKN"/>
-                            <constraint firstItem="jGC-3L-9Um" firstAttribute="trailing" secondItem="jij-t7-zCY" secondAttribute="trailing" id="qXe-P5-MY6"/>
                             <constraint firstItem="jij-t7-zCY" firstAttribute="bottom" secondItem="nqA-FF-aMJ" secondAttribute="bottom" constant="35" id="rjG-z6-8aH"/>
-                            <constraint firstItem="jGC-3L-9Um" firstAttribute="bottom" secondItem="jij-t7-zCY" secondAttribute="bottom" id="rq9-se-5dj"/>
-                            <constraint firstItem="nqA-FF-aMJ" firstAttribute="centerX" secondItem="8ze-qw-dRA" secondAttribute="centerX" constant="95" id="sCH-2R-4Wi"/>
+                            <constraint firstItem="jij-t7-zCY" firstAttribute="trailing" secondItem="nqA-FF-aMJ" secondAttribute="trailing" constant="20" id="sCH-2R-4Wi"/>
                             <constraint firstItem="jij-t7-zCY" firstAttribute="bottom" secondItem="lmm-Ty-vl6" secondAttribute="bottom" constant="25" id="t0l-GX-7v2"/>
                             <constraint firstItem="lmm-Ty-vl6" firstAttribute="leading" secondItem="jij-t7-zCY" secondAttribute="leading" constant="20" id="zuS-KY-tMG"/>
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="blackbottom" destination="jGC-3L-9Um" id="meg-H7-5oV"/>
                         <outlet property="imageview" destination="lmm-Ty-vl6" id="4tT-eQ-Drt"/>
                         <outlet property="okbutton" destination="nqA-FF-aMJ" id="BGp-mM-zEZ"/>
                         <outlet property="photoButton" destination="cRf-Sp-1y2" id="E8a-Tn-i4I"/>
@@ -108,8 +113,5 @@
     </scenes>
     <resources>
         <image name="cameraicon" width="214" height="213"/>
-        <systemColor name="viewFlipsideBackgroundColor">
-            <color red="0.1215686274509804" green="0.12941176470588239" blue="0.14117647058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-        </systemColor>
     </resources>
 </document>

package/src/ios/UICustomPickerController.m

@@ -7,6 +7,15 @@
 #import "UICustomPickerController.h"
 
 @implementation UICustomPickerController
+
+- (BOOL)prefersStatusBarHidden {
+    return NO;
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
 -(void)initData:(UIImageView*)souche mCamera:(ScoplanCamera*)mcm{
     imageSouche = souche;
     mCamera = mcm;

package/src/ios/UIScoplanCamera.m

@@ -64,8 +64,8 @@ typedef NS_ENUM( NSInteger, AVCamDepthDataDeliveryMode ) {
 @property (strong, nonatomic) IBOutlet UIView *rootView;
 @property (strong, nonatomic) IBOutlet UIImageView *imageview;
 @property (strong, nonatomic) IBOutlet UIButton *okbutton;
-@property (strong, nonatomic) IBOutlet UIView *blackbottom;
 @property (strong, nonatomic) IBOutlet UIImageView *progress;
+@property (nonatomic, strong) AVCaptureVideoPreviewLayer *fullscreenPreviewLayer;
 
 // Session management.
 @property (nonatomic, weak) IBOutlet AVCamPreviewView *previewView;
@@ -113,7 +113,7 @@ typedef NS_ENUM( NSInteger, AVCamDepthDataDeliveryMode ) {
 
 - (void)insertImgUrl:(NSString*)url{
     dispatch_async(dispatch_get_main_queue(), ^{
-        [_okbutton setTitle: @"OK" forState: UIControlStateNormal];
+        [_okbutton setTitle:@"OK" forState:UIControlStateNormal];
         [_photoButton setHidden:FALSE];
         [_progress stopAnimating];
         [_progress setHidden:TRUE];
@@ -160,6 +160,7 @@ typedef NS_ENUM( NSInteger, AVCamDepthDataDeliveryMode ) {
     
     // Set up the preview view.
     self.previewView.session = self.session;
+    self.previewView.videoPreviewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
     
     // Communicate with the session and other session objects on this queue.
     self.sessionQueue = dispatch_queue_create( "session queue", DISPATCH_QUEUE_SERIAL );
@@ -234,6 +235,14 @@ typedef NS_ENUM( NSInteger, AVCamDepthDataDeliveryMode ) {
 }
 
 
+- (void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
+    if (self.fullscreenPreviewLayer) {
+        self.fullscreenPreviewLayer.frame = _rootView.bounds;
+    }
+}
+
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
@@ -268,11 +277,14 @@ typedef NS_ENUM( NSInteger, AVCamDepthDataDeliveryMode ) {
                                 }
                                 
                             }];
-    AVCaptureVideoPreviewLayer *previewLayer = [AVCaptureVideoPreviewLayer layerWithSession:self.session];
-    previewLayer.frame = _rootView.bounds;
-    previewLayer.videoGravity = AVLayerVideoGravityResizeAspect;
-    [_rootView.layer addSublayer:previewLayer];
-    _blackbottom.layer.zPosition = 1;
+    // Remove old preview layer if any (e.g. on re-appear)
+    if (self.fullscreenPreviewLayer) {
+        [self.fullscreenPreviewLayer removeFromSuperlayer];
+    }
+    self.fullscreenPreviewLayer = [AVCaptureVideoPreviewLayer layerWithSession:self.session];
+    self.fullscreenPreviewLayer.frame = _rootView.bounds;
+    self.fullscreenPreviewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
+    [_rootView.layer addSublayer:self.fullscreenPreviewLayer];
     _photoButton.imageView.layer.zPosition = 1;
     _photoButton.layer.zPosition = 1;
     _imageview.layer.zPosition = 1;

package/src/ios/multicam.xib

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,9 +12,10 @@
         <view contentMode="scaleToFill" id="2Si-cO-KSW">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" white="0" alpha="0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <subviews>
                 <view hidden="YES" tag="11" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SRs-0J-vwF">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                    <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" tag="13" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Dessiner sur cette photo" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3SW-lA-FXP">
                             <rect key="frame" x="144" y="11" width="187" height="21"/>
@@ -62,13 +62,30 @@
                     </constraints>
                 </imageView>
                 <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="utO-5P-M5r">
-                    <rect key="frame" x="251.5" y="602" width="62" height="30"/>
+                    <rect key="frame" x="311" y="598" width="44" height="44"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="30" id="tsh-0X-lyK"/>
+                        <constraint firstAttribute="height" constant="44" id="tsh-0X-lyK"/>
+                        <constraint firstAttribute="width" constant="44" id="utO-w-44w"/>
                     </constraints>
-                    <state key="normal" title="Annuler">
-                        <color key="titleColor" red="1" green="1" blue="0.1004503038" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="backgroundColor" red="0.6" green="0.6" blue="0.6" alpha="0.8" colorSpace="calibratedRGB"/>
+                    <state key="normal" title="X">
+                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                            <real key="value" value="22"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds">
+                            <boolean key="value" value="YES"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
+                            <real key="value" value="2"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="layer.borderColor">
+                            <color key="value" white="0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </userDefinedRuntimeAttribute>
+                    </userDefinedRuntimeAttributes>
                 </button>
                 <button opaque="NO" tag="1" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f3a-n0-68n">
                     <rect key="frame" x="162.5" y="592" width="50" height="50"/>
@@ -94,8 +111,7 @@
                 <constraint firstItem="w0n-Df-NWM" firstAttribute="bottom" secondItem="f3a-n0-68n" secondAttribute="bottom" constant="25" id="Oi4-t0-CQ6"/>
                 <constraint firstItem="f3a-n0-68n" firstAttribute="centerX" secondItem="2Si-cO-KSW" secondAttribute="centerX" id="SUH-d2-dsP"/>
                 <constraint firstItem="w0n-Df-NWM" firstAttribute="bottom" secondItem="utO-5P-M5r" secondAttribute="bottom" constant="35" id="Sx5-aI-blt"/>
-                <constraint firstItem="utO-5P-M5r" firstAttribute="centerX" secondItem="2Si-cO-KSW" secondAttribute="centerX" constant="95" id="WjK-KC-LQF"/>
-                <constraint firstItem="SRs-0J-vwF" firstAttribute="top" secondItem="w0n-Df-NWM" secondAttribute="top" id="aoW-sr-zz9"/>
+                <constraint firstItem="w0n-Df-NWM" firstAttribute="trailing" secondItem="utO-5P-M5r" secondAttribute="trailing" constant="20" id="WjK-KC-LQF"/>
                 <constraint firstItem="SRs-0J-vwF" firstAttribute="trailing" secondItem="w0n-Df-NWM" secondAttribute="trailing" id="nVN-7W-wYt"/>
                 <constraint firstItem="WzM-XN-do1" firstAttribute="centerX" secondItem="2Si-cO-KSW" secondAttribute="centerX" id="sAe-d3-TMO"/>
                 <constraint firstItem="w0n-Df-NWM" firstAttribute="bottom" secondItem="Yg9-0S-pJv" secondAttribute="bottom" constant="25" id="uoV-VQ-OE3"/>