scoplan.camera 1.2.9 → 1.2.10

package/package.json

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

package/src/android/CameraFragment.java

@@ -302,13 +302,19 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
                     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());
-                        // surfaceChanged will be called → createCameraPreview
                         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;
                 }
@@ -547,6 +553,7 @@ public class CameraFragment extends Fragment implements scoplan.camera.OnImageCa
             }
             cameraIsOpen = false;
             previewReady = false;
+            surfaceSizeConfigured = false;
             cameraDevice = null;
             cameraId = null;
         }

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"/>