Merge lp:~uriboni/camera-app/real-picture-snapshot into lp:camera-app/staging

[Ugo Riboni]

Use the final picture as the sliding snapshot instead of the preview

Use the final picture as the sliding snapshot instead of the preview

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:641
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/17/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/378
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1049
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/931
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27009

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[lp:~uriboni/camera-app/real-picture-snapshot]

642. By Ugo Riboni on 2016-01-26

Merge Florian's fixes

643. By Ugo Riboni on 2016-01-26

Go back to using a preview, which the backend now creates from the actual image before saving it to disk

644. By Ugo Riboni on 2016-01-26

Keep the controls always visible and below the snapshot while it slides

645. By Ugo Riboni on 2016-01-26

Ensure everything works properly when exporting pictures

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:645
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/18/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/379
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1050
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/933
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27051

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/18/rebuild

review: Needs Fixing (continuous-integration)

[lp:~uriboni/camera-app/real-picture-snapshot]

646. By Ugo Riboni on 2016-01-27

On media export prevent the screen from turning black while the snapshot loads

647. By Ugo Riboni on 2016-01-27

Remove unused properties

648. By Ugo Riboni on 2016-01-27

Refactor the export confirmation so it does not use identifiers out of scope

649. By Ugo Riboni on 2016-01-27

Remove debug

650. By Ugo Riboni on 2016-01-27

Pulse the shoot button while the capture is in progress to indicate progress

651. By Ugo Riboni on 2016-01-27

Simplify code

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:646
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/19/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/381
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/935
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27073

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:651
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/21/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/384
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/939
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27086

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/21/rebuild

review: Needs Fixing (continuous-integration)

[lp:~uriboni/camera-app/real-picture-snapshot]

652. By Ugo Riboni on 2016-01-28

Ensure the photo roll hint is below the snapshot and that it does not become visible too early

653. By Ugo Riboni on 2016-01-28

Merge from parent branch

654. By Ugo Riboni on 2016-01-28

Merge more fixes from another branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:652
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/24/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/387
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/943
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27121

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/24/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:654
http://jenkins.qa.ubuntu.com/job/camera-app-staging-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-amd64-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-staging-vivid-i386-ci/25/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/390
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1059
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/947
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-staging-ci/25/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== added file 'ProcessingFeedback.qml'
--- ProcessingFeedback.qml	1970-01-01 00:00:00 +0000
+++ ProcessingFeedback.qml	2016-01-28 15:06:01 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: processingFeedback
+
+    property bool processing: false
+
+    Timer {
+        interval: 2000
+        running: processing
+        onTriggered: spinner.running = true
+    }
+
+    onProcessingChanged: if (!processing) spinner.running = false
+
+    ActivityIndicator {
+        id: spinner
+        opacity: running ? 1.0 : 0.0
+        Behavior on opacity {
+            OpacityAnimator {
+                duration: UbuntuAnimation.SnapDuration
+                easing: UbuntuAnimation.StandardEasing
+            }
+        }
+    }
+}

=== modified file 'Snapshot.qml'
--- Snapshot.qml	2015-10-22 12:21:14 +0000
+++ Snapshot.qml	2016-01-28 15:06:01 +0000
@@ -21,17 +21,19 @@
 Item {
     id: snapshotRoot
     property alias source: snapshot.source
-    property alias sliding: shoot.running
-    property int orientation
+    property bool shouldSlide: true
+    property bool sliding: false
     property ViewFinderGeometry geometry
-    property bool deviceDefaultIsPortrait: true
     property bool loading: snapshot.status == Image.Loading
-
-    function startOutAnimation() {
-        shoot.restart()
-    }
-
-    visible: false
+    property bool loaded: snapshot.status == Image.Ready
+
+    opacity: 0.0
+
+    // Rotation and sliding direction is locked at the moment the picture is shoot
+    // (in case processing is long, such as with HDR)
+    function lockOrientation() { snapshot.rotation = orientationAngle }
+
+    onLoadedChanged: if (loaded && shouldSlide) shoot.restart()
 
     Item {
         id: container
@@ -42,14 +44,13 @@
             id: snapshot
             anchors.centerIn: parent
             anchors.verticalCenterOffset: -geometry.y
-            rotation: snapshotRoot.orientation * -1
 
             asynchronous: true
             cache: false
             fillMode: Image.PreserveAspectFit
             smooth: false
-            width: deviceDefaultIsPortrait ? geometry.height : geometry.width
-            height: deviceDefaultIsPortrait ? geometry.width : geometry.height
+            width: rotation == 0 ? geometry.width : geometry.height
+            height: rotation == 0 ? geometry.height : geometry.width
             sourceSize.width: width
             sourceSize.height: height
         }
@@ -57,10 +58,12 @@
         Image {
             id: shadow
 
-            property bool rotated: (snapshot.rotation % 180) != 0
-            height: rotated ? snapshot.width : snapshot.height
+            transformOrigin: Item.TopLeft
+            rotation: snapshot.rotation
             width: units.gu(2)
-            x: (container.width - (rotated ? snapshot.height : snapshot.width)) / 2 - width
+            height: rotation == 0 ? snapshot.height : snapshot.width
+            x: rotation == 90 ? container.width : - width
+            y: rotation == 270 ? container.height + width : (rotation == 90 ? - width : 0)
             source: "assets/shadow.png"
             fillMode: Image.Stretch
             asynchronous: true
@@ -75,8 +78,12 @@
     SequentialAnimation {
         id: shoot
 
-        PropertyAction { target: snapshotRoot; property: "visible"; value: true }
+        NumberAnimation {
+            target: snapshotRoot; property: "opacity"; to: 1.0
+            duration: UbuntuAnimation.SnapDuration
+        }
         PauseAnimation { duration: 150 }
+        PropertyAction { target: snapshotRoot; property: "sliding"; value: true}
         XAnimator {
             target: container
             to: angleToOrientation[orientationAngle] == "PORTRAIT" ? container.width + shadow.width : 0
@@ -91,8 +98,9 @@
             easing: UbuntuAnimation.StandardEasing
         }
         PropertyAction { target: snapshot; property: "source"; value: ""}
-        PropertyAction { target: snapshotRoot; property: "visible"; value: false }
+        PropertyAction { target: snapshotRoot; property: "opacity"; value: 0.0 }
         PropertyAction { target: container; property: "x"; value: 0 }
         PropertyAction { target: container; property: "y"; value: 0 }
+        PropertyAction { target: snapshotRoot; property: "sliding"; value: false}
     }
 }

=== modified file 'ViewFinderExportConfirmation.qml'
--- ViewFinderExportConfirmation.qml	2015-12-10 12:17:49 +0000
+++ ViewFinderExportConfirmation.qml	2016-01-28 15:06:01 +0000
@@ -22,23 +22,7 @@
 
     property bool isVideo
     property string mediaPath
-    property Snapshot snapshot
-
-    function confirmExport(path) {
-        viewFinder.visible = false;
-        viewFinderOverlay.visible = false;
-        mediaPath = path;
-        if (!isVideo) snapshot.visible = true;
-        visible = true;
-    }
-
-    function hide() {
-        viewFinder.visible = true;
-        viewFinderOverlay.visible = true;
-        snapshot.source = "";
-        snapshot.visible = false;
-        visible = false;
-    }
+    signal hideRequested()
 
     visible: false
 
@@ -74,7 +58,7 @@
                         }
 
                         iconName: "reload"
-                        onClicked: viewFinderExportConfirmation.hide()
+                        onClicked: hideRequested()
                     }
 
                     CircleButton {
@@ -90,8 +74,9 @@
 
                         iconName: "ok"
                         onClicked: {
-                            viewFinderExportConfirmation.hide();
+                            hideRequested();
                             main.exportContent([mediaPath]);
+                            mediaPath = "";
                         }
                     }
 
@@ -108,8 +93,9 @@
 
                         iconName: "close"
                         onClicked: {
-                            viewFinderExportConfirmation.hide();
+                            hideRequested();
                             main.cancelExport();
+                            mediaPath = "";
                         }
                     }
                 }

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2016-01-21 17:12:30 +0000
+++ ViewFinderOverlay.qml	2016-01-28 15:06:01 +0000
@@ -684,6 +684,7 @@
                 if (!main.contentExportMode) {
                     shootFeedback.start();
                 }
+                camera.photoCaptureInProgress = true;
                 camera.imageCapture.setMetadata("Orientation", orientation);
                 var position = positionSource.position;
                 if (settings.gpsEnabled && positionSource.valid
@@ -698,7 +699,6 @@
                     }
                 }
 
-                camera.photoCaptureInProgress = true;
                 if (main.contentExportMode) {
                     camera.imageCapture.captureToLocation(application.temporaryLocation);
                 } else if (application.removableStoragePresent && settings.preferRemovableStorage) {
@@ -945,6 +945,16 @@
         }
     }
 
+    ProcessingFeedback {
+        anchors {
+            top: parent.top
+            topMargin: units.gu(2)
+            left: parent.left
+            leftMargin: units.gu(2)
+        }
+        processing: camera.photoCaptureInProgress
+    }
+
     StorageMonitor {
         id: storageMonitor
         location: (application.removableStoragePresent && settings.preferRemovableStorage) ?

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2016-01-21 16:40:19 +0000
+++ ViewFinderView.qml	2016-01-28 15:06:01 +0000
@@ -96,6 +96,13 @@
         property bool switchInProgress: false
         property bool photoCaptureInProgress: false
 
+        onPhotoCaptureInProgressChanged: {
+            if (photoCaptureInProgress) {
+                snapshot.lockOrientation();
+                viewFinder.opacity = 0.1;
+            }
+        }
+
         imageCapture {
             onReadyChanged: {
                 if (camera.imageCapture.ready && main.transfer) {
@@ -110,20 +117,17 @@
                 camera.photoCaptureInProgress = false;
                 console.log("Capture failed for request " + requestId + ": " + message);
             }
-            onImageCaptured: {
-                snapshot.source = preview;
-                if (!main.contentExportMode) {
-                    viewFinderOverlay.visible = true;
-                    snapshot.startOutAnimation();
-                    if (photoRollHint.necessary) {
-                        photoRollHint.enable();
-                    }
-                }
-            }
+
+            onImageCaptured: snapshot.source = preview
+
             onImageSaved: {
                 if (main.contentExportMode) {
-                    viewFinderExportConfirmation.confirmExport(path);
+                    // show export confirmation only when both the image is saved and the snapshot
+                    // is loaded to prevent the screen being black while the image loads
+                    viewFinderExportConfirmation.mediaPath = path;
+                    if (snapshot.loaded) viewFinderExportConfirmation.show()
                 }
+
                 viewFinderView.photoTaken(path);
                 camera.photoCaptureInProgress = false;
                 metricPhotos.increment();
@@ -135,10 +139,10 @@
             onRecorderStateChanged: {
                 if (videoRecorder.recorderState === CameraRecorder.StoppedState) {
                     metricVideos.increment()
-                    viewFinderOverlay.visible = true;
                     viewFinderView.videoShot(videoRecorder.actualLocation);
                     if (main.contentExportMode) {
-                        viewFinderExportConfirmation.confirmExport(videoRecorder.actualLocation);
+                        viewFinderExportConfirmation.mediaPath = videoRecorder.actualLocation
+                        viewFinderExportConfirmation.show();
                     } else if (photoRollHint.necessary) {
                         photoRollHint.enable();
                     }
@@ -329,12 +333,10 @@
             anchors.fill: parent
 
             function start() {
-                viewFinderOverlay.visible = false;
             }
 
             function stop() {
                 remainingSecsLabel.text = "";
-                viewFinderOverlay.visible = true;
             }
 
             function showRemainingSecs(secs) {
@@ -383,7 +385,6 @@
 
             function start() {
                 shootFeedback.opacity = 1.0;
-                viewFinderOverlay.visible = false;
                 shootFeedbackAnimation.restart();
             }
 
@@ -392,7 +393,7 @@
                 target: shootFeedback
                 from: 1.0
                 to: 0.0
-                duration: 50
+                duration: UbuntuAnimation.SnapDuration
                 easing: UbuntuAnimation.StandardEasing
             }
         }
@@ -409,19 +410,10 @@
         visible: radius !== 0
     }
 
-    ViewFinderOverlayLoader {
-        id: viewFinderOverlay
-
-        anchors.fill: parent
-        camera: camera
-        opacity: status == Loader.Ready && overlayVisible && !photoRollHint.enabled ? 1.0 : 0.0
-        Behavior on opacity {UbuntuNumberAnimation {duration: UbuntuAnimation.SnapDuration}}
-    }
-
     PhotoRollHint {
         id: photoRollHint
         anchors.fill: parent
-        visible: enabled && !snapshot.loading
+        visible: enabled
 
         Connections {
             target: viewFinderView
@@ -432,15 +424,51 @@
     Snapshot {
         id: snapshot
         anchors.fill: parent
-        orientation: viewFinder.orientation
         geometry: viewFinderGeometry
-        deviceDefaultIsPortrait: Screen.primaryOrientation === Qt.PortraitOrientation
+        shouldSlide: !main.contentExportMode
+        onSlidingChanged: {
+            if (sliding) {
+                viewFinder.opacity = 1.0;
+                if (!main.contentExportMode && photoRollHint.necessary) photoRollHint.enable();
+            }
+        }
+
+        // show export confirmation only when both the image is saved and the snapshot
+        // is loaded to prevent the screen being black while the image loads
+        onLoadedChanged: {
+            if (main.contentExportMode && loaded && viewFinderExportConfirmation.mediaPath != "") viewFinderExportConfirmation.show()
+        }
+    }
+
+    ViewFinderOverlayLoader {
+        id: viewFinderOverlay
+
+        anchors.fill: parent
+        camera: camera
+        opacity: status == Loader.Ready && overlayVisible && !photoRollHint.enabled ? 1.0 : 0.0
+        Behavior on opacity {UbuntuNumberAnimation {duration: UbuntuAnimation.SnapDuration}}
     }
 
     ViewFinderExportConfirmation {
         id: viewFinderExportConfirmation
         anchors.fill: parent
-        snapshot: snapshot
+
         isVideo: main.transfer.contentType == ContentType.Videos
+        onVisibleChanged: if (visible) viewFinder.opacity = 1.0
+
+        function show() {
+            viewFinder.visible = false;
+            viewFinderOverlay.visible = false;
+            if (!isVideo) snapshot.opacity = 1.0;
+            visible = true;
+        }
+
+        onHideRequested: {
+            viewFinder.visible = true;
+            viewFinderOverlay.visible = true;
+            snapshot.source = "";
+            snapshot.opacity = 0.0;
+            visible = false;
+        }
     }
 }