Merge lp:~phablet-team/messaging-app/add_thumbnail_to_video_previewer into lp:messaging-app

[Arthur Mello]

Add a thumbnail to MMS previewer after video has ended to reduce visual issues

Add a thumbnail to MMS previewer after video has ended to reduce visual issues

[Gustavo Pichorim Boiko (boiko)]

Just one comment inline.

review: Needs Fixing

[lp:~phablet-team/messaging-app/add_thumbnail_to_video_previewer]

488. By Arthur Mello on 2016-01-29

Rename property

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:487
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/925/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6263/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/434
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6274/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/925/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:488
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/926/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/435
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4820
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6276
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6276/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27168

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/926/rebuild

review: Needs Fixing (continuous-integration)

[lp:~phablet-team/messaging-app/add_thumbnail_to_video_previewer]

489. By Arthur Mello on 2016-02-01

Change previewer fillMode to wk better with landscape mode

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:489
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/933/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6282/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/442
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6293/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/933/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good now!

review: Approve

=== modified file 'src/qml/MMS/PreviewerVideo.qml'
--- src/qml/MMS/PreviewerVideo.qml	2016-02-01 15:11:45 +0000
+++ src/qml/MMS/PreviewerVideo.qml	2016-02-01 15:11:45 +0000
@@ -27,6 +27,8 @@
 Previewer {
     id: videoPreviewer
 
+    property size thumbnailSize: Qt.size(viewer.width * 1.05, viewer.height * 1.05)
+
     title: i18n.tr("Video Preview")
     clip: true
 
@@ -37,6 +39,22 @@
     }
     Component.onDestruction: application.fullscreen = false
 
+    onWidthChanged: {
+        // Only change thumbnailSize if width increases more than 5%
+        // that way we do not reload image for small resizes
+        if (width > thumbnailSize.width) {
+            thumbnailSize = Qt.size(width * 1.05, height * 1.05);
+        }
+    }
+
+    onHeightChanged: {
+        // Only change thumbnailSize if height increases more than 5%
+        // that way we do not reload image for small resizes
+        if (height > thumbnailSize.height) {
+            thumbnailSize = Qt.size(width * 1.05, height * 1.05);
+        }
+    }
+
     Connections {
         target: application
         onFullscreenChanged: {
@@ -94,6 +112,42 @@
                     anchors.fill: parent
                     source: player
                 }
+
+                Rectangle {
+                    id: thumbnail
+
+                    anchors.fill: parent
+                    visible: player.status == MediaPlayer.EndOfMedia
+
+                    color: "black"
+
+                    ActivityIndicator {
+                        anchors.centerIn: parent
+                        visible: running
+                        running: image.status != Image.Ready
+                    }
+
+                    Image {
+                        id: image
+
+                        anchors.fill: parent
+                        visible: status == Image.Ready
+                        opacity: visible ? 1.0 : 0.0
+                        Behavior on opacity { UbuntuNumberAnimation {} }
+
+                        fillMode: Image.PreserveAspectFit
+                        smooth: true
+                        source: "image://thumbnailer/" + player.source.toString().replace("file://", "")
+
+                        asynchronous: true
+                        cache: true
+
+                        sourceSize {
+                            width: videoPreviewer.thumbnailSize.width
+                            height: videoPreviewer.thumbnailSize.height
+                        }
+                    }
+                }
             }
         }
     }