Merge lp:~cimi/unity8/carousel-music-video into lp:unity8

[Andrea Cimitan]

Added music and video carousel using new assets (music carousel asset will need future update)

Added music and video carousel using new assets (music carousel asset will need future update).

This branch will conflict with https://code.launchpad.net/~unity-team/unity8/carousel-loader/+merge/190406 so the last to get approved will require a small update

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:464
http://jenkins.qa.ubuntu.com/job/unity8-ci/1416/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5025
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1416
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1416/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/900
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/900/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2956
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2956/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2462
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2505

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1416/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

What is " // XXX test on Nexus 10"?

What's the status of the incorrect shape of the overlay?

 34 + borderSource: "cimi wants no borders"
Erm... Filed a bug about this?

49 + duration: 250
50 + easing.type: Easing.InOutQuad

We've got UbuntuAnimation for standard durations. Also, opacity animations are supposed to be Linear.

67 + visible: true

Is default.

review: Needs Fixing

[Andrea Cimitan (cimi)]

> What is " // XXX test on Nexus 10"?
>
> What's the status of the incorrect shape of the overlay?
>
> 34 + borderSource: "cimi wants no borders"
> Erm... Filed a bug about this?
>
bordersource needs a not-empty and incorrect value to disable borders...

> 49 + duration: 250
> 50 + easing.type: Easing.InOutQuad
>
> We've got UbuntuAnimation for standard durations. Also, opacity animations are
> supposed to be Linear.
>
> 67 + visible: true
>
> Is default.
will fix those tomorrow morning

[lp:~cimi/unity8/carousel-music-video]

465. By Andrea Cimitan on 2013-10-22

use ubuntu animation

466. By Andrea Cimitan on 2013-10-22

Merged lp:~unity-team/unity8/carousel-loader

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/unity8-ci/1467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/5125
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/3137/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/490
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1471
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1471/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/1000
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/1000/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3139
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/3139/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2618/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2669/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/267
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/266

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1467/rebuild

review: Needs Fixing (continuous-integration)

[lp:~cimi/unity8/carousel-music-video]

467. By Andrea Cimitan on 2013-10-22

Update asset

468. By Andrea Cimitan on 2013-10-22

Update comments

469. By Andrea Cimitan on 2013-10-22

Changed url :)

470. By Andrea Cimitan on 2013-10-23

Extra fixes and refinements for carousel music and video (align video grid tiles too)

471. By Andrea Cimitan on 2013-10-23

Updated overlay asset

472. By Andrea Cimitan on 2013-10-25

Delete tags

Unmerged revisions

472. By Andrea Cimitan on 2013-10-25

Delete tags

471. By Andrea Cimitan on 2013-10-23

Updated overlay asset

470. By Andrea Cimitan on 2013-10-23

Extra fixes and refinements for carousel music and video (align video grid tiles too)

469. By Andrea Cimitan on 2013-10-22

Changed url :)

468. By Andrea Cimitan on 2013-10-22

Update comments

467. By Andrea Cimitan on 2013-10-22

Update asset

466. By Andrea Cimitan on 2013-10-22

Merged lp:~unity-team/unity8/carousel-loader

465. By Andrea Cimitan on 2013-10-22

use ubuntu animation

464. By Andrea Cimitan on 2013-10-15

Added carousel music and video renderers

=== added file 'Dash/Generic/GenericCarouselLoader.qml'
--- Dash/Generic/GenericCarouselLoader.qml	1970-01-01 00:00:00 +0000
+++ Dash/Generic/GenericCarouselLoader.qml	2013-10-22 09:29:38 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2013 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.0
+import Ubuntu.Components 0.1
+
+Loader {
+    property var model: null
+    property url carouselUrl: "GenericCarousel.qml"
+    property url filtergridUrl: "GenericFilterGrid.qml"
+
+    source: model.count > 6 ? carouselUrl : filtergridUrl // FIXME do not hardcode 6, but retrieve correct minimum required count
+
+    onLoaded: {
+        item.model = Qt.binding(function() { return model; })
+    }
+}

=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml	2013-10-11 13:54:24 +0000
+++ Dash/GenericScopeView.qml	2013-10-22 09:29:38 +0000
@@ -238,26 +238,27 @@
             rendererId = getDefaultRendererId(contentType);
         }
         switch (rendererId) {
+            case "carousel": {
+                switch (contentType) {
+                    case "music": return "Music/MusicCarouselLoader.qml";
+                    case "video": return "Video/VideoCarouselLoader.qml";
+                    default: return "Generic/GenericCarouselLoader.qml";
+                }
+            }
             case "grid": {
                 switch (contentType) {
-                    case "video": return "Video/VideoFilterGrid.qml";
-                    case "music": return "Music/MusicFilterGrid.qml";
                     case "apps": {
                         if (rendererHint == "toggled")
                             return "Apps/DashPluginFilterGrid.qml";
                         else
                             return "Generic/GenericFilterGrid.qml";
                     }
+                    case "music": return "Music/MusicFilterGrid.qml";
+                    case "video": return "Video/VideoFilterGrid.qml";
                     case "weather": return "Generic/WeatherFilterGrid.qml";
                     default: return "Generic/GenericFilterGrid.qml";
                 }
             }
-            case "carousel": {
-                switch (contentType) {
-                    case "music": return "Music/MusicCarousel.qml";
-                    default: return "Generic/GenericCarousel.qml";
-                }
-            }
             case "special": {
                 switch (contentType) {
                     case "apps": return "Apps/RunningApplicationsGrid.qml";

=== modified file 'Dash/Music/CarouselDelegateMusic.qml'
--- Dash/Music/CarouselDelegateMusic.qml	2013-07-09 11:04:25 +0000
+++ Dash/Music/CarouselDelegateMusic.qml	2013-10-22 09:29:38 +0000
@@ -21,22 +21,67 @@
 BaseCarouselDelegate {
     id: item
 
-    UbuntuShape {
+    Image {
         anchors.fill: parent
-        radius: "medium"
-        borderSource: ""
-        image: Image {
-            asynchronous: true
-            sourceSize { width: item.width; height: item.height }
-            source: model ? model.icon : ""
+        source: "graphics/music_lens_carousel_itemholder.png"
+
+        UbuntuShape {
+            anchors.fill: parent
+            radius: "medium"
+            borderSource: "cimi wants no borders"
+            image: Image {
+                asynchronous: true
+                sourceSize { width: item.width; height: item.height }
+                source: model ? model.icon : ""
+            }
+        }
+
+        Loader {
+            id: loaderFrame
+            anchors.fill: parent
+            opacity: item.explicitlyScaled ? 1.0 : 0
+
+            Behavior on opacity {
+                UbuntuNumberAnimation {
+                    easing.type: Easing.Linear
+                }
+            }
+
+            sourceComponent: opacity > 0 ? componentFrame : undefined
         }
     }
 
-    BorderImage {
-        anchors.centerIn: parent
-        opacity: 0.6
-        source: "../../Components/graphics/non-selected.sci"
-        width: parent.width + units.gu(1.5)
-        height: parent.height + units.gu(1.5)
+    Component {
+        id: componentFrame
+        Image {
+            source: "graphics/music_lens_carousel_text_overlay.png"
+
+            Column {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    bottom: parent.bottom
+                    margins: units.gu(1)
+                }
+
+                Label {
+                    text: model ? model.comment : ""
+                    fontSize: "small"
+                    font.weight: Font.Bold
+                    elide: Text.ElideRight
+                    wrapMode: Text.Wrap
+                    maximumLineCount: 2
+                    width: parent.width
+                }
+                Label {
+                    text: model ? model.title : ""
+                    fontSize: "x-small"
+                    elide: Text.ElideRight
+                    wrapMode: Text.Wrap
+                    maximumLineCount: 1
+                    width: parent.width
+                }
+            }
+        }
     }
 }

=== added file 'Dash/Music/MusicCarouselLoader.qml'
--- Dash/Music/MusicCarouselLoader.qml	1970-01-01 00:00:00 +0000
+++ Dash/Music/MusicCarouselLoader.qml	2013-10-22 09:29:38 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2013 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.0
+import Ubuntu.Components 0.1
+import "../Generic"
+
+GenericCarouselLoader {
+    carouselUrl: "MusicCarousel.qml"
+    filtergridUrl: "MusicFilterGrid.qml"
+}

=== added directory 'Dash/Music/graphics'
=== added file 'Dash/Music/graphics/[e-mail]'
Binary files Dash/Music/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and Dash/Music/graphics/[e-mail]	2013-10-22 09:29:38 +0000 differ
=== added file 'Dash/Music/graphics/[e-mail]'
Binary files Dash/Music/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and Dash/Music/graphics/[e-mail]	2013-10-22 09:29:38 +0000 differ
=== modified file 'Dash/Video/CarouselDelegateVideo.qml'
--- Dash/Video/CarouselDelegateVideo.qml	2013-07-09 09:06:29 +0000
+++ Dash/Video/CarouselDelegateVideo.qml	2013-10-22 09:29:38 +0000
@@ -21,22 +21,61 @@
 BaseCarouselDelegate {
     id: item
 
-    UbuntuShape {
+    Image {
         anchors.fill: parent
-        radius: "medium"
-        borderSource: ""
-        image: Image {
+        source: "graphics/movie_icon_holder_carousel.png"
+
+        Image {
+            id: thumbnail
             asynchronous: true
+            anchors {
+                fill: parent;
+                leftMargin: units.dp(2)
+                rightMargin: units.dp(2)
+                topMargin: units.gu(2) + units.dp(2) // XXX test on Nexus 10
+                bottomMargin: units.gu(2.5) - units.dp(1) // XXX test on Nexus 10
+            }
             sourceSize { width: item.width; height: item.height }
             source: model ? model.icon : ""
+            fillMode: Image.PreserveAspectCrop
+        }
+
+        Loader {
+            id: loaderFrame
+            anchors {
+                left: thumbnail.left
+                right: thumbnail.right
+                bottom: thumbnail.bottom
+            }
+            height: units.gu(6)
+            opacity: item.explicitlyScaled ? 1.0 : 0
+
+            Behavior on opacity {
+                UbuntuNumberAnimation {
+                    easing.type: Easing.Linear
+                }
+            }
+
+            sourceComponent: opacity > 0 ? componentFrame : undefined
         }
     }
 
-    BorderImage {
-        anchors.centerIn: parent
-        opacity: 0.6
-        source: "../../Components/graphics/non-selected.sci"
-        width: parent.width + units.gu(1.5)
-        height: parent.height + units.gu(1.5)
+    Component {
+        id: componentFrame
+        Rectangle {
+            color: Qt.rgba(0, 0, 0, 0.8)
+
+            Label {
+                anchors.centerIn: parent
+                width: parent.width - units.gu(2)
+                text: model ? model.title : ""
+                fontSize: "small"
+                font.weight: Font.Bold
+                elide: Text.ElideRight
+                wrapMode: Text.Wrap
+                maximumLineCount: 2
+                horizontalAlignment: Text.AlignHCenter
+            }
+        }
     }
 }

=== renamed file 'Dash/Video/VideosCarousel.qml' => 'Dash/Video/VideoCarousel.qml'
--- Dash/Video/VideosCarousel.qml	2013-06-05 22:03:08 +0000
+++ Dash/Video/VideoCarousel.qml	2013-10-22 09:29:38 +0000
@@ -19,10 +19,10 @@
 
 Carousel {
     id: videosCarousel
-    tileAspectRatio: 198 / 288
+    tileAspectRatio: 1
     minimumTileWidth: units.gu(13)
     itemComponent: carouselDelegateVideo
-    selectedItemScaleFactor: 1.14
+    selectedItemScaleFactor: 1.2
     cacheBuffer: 1404 // 18px * 13gu * 6
     height: implicitHeight + units.gu(6)
 

=== added file 'Dash/Video/VideoCarouselLoader.qml'
--- Dash/Video/VideoCarouselLoader.qml	1970-01-01 00:00:00 +0000
+++ Dash/Video/VideoCarouselLoader.qml	2013-10-22 09:29:38 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2013 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.0
+import Ubuntu.Components 0.1
+import "../Generic"
+
+GenericCarouselLoader {
+    carouselUrl: "VideoCarousel.qml"
+    filtergridUrl: "VideoFilterGrid.qml"
+}

=== added file 'Dash/Video/graphics/[e-mail]'
Binary files Dash/Video/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and Dash/Video/graphics/[e-mail]	2013-10-22 09:29:38 +0000 differ