Merge lp:~ahayzen/music-app/remix-perf-003 into lp:music-app/remix

[Andrew Hayzen]

* Optimise MusicRow.qml by using Image rather than CoverGrid (as there will only ever be one image)

* Optimise MusicRow.qml by using Image rather than CoverGrid (as there will only ever be one image)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:694
http://91.189.93.70:8080/job/music-app-remix-ci/149/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1187
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/149

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/149/rebuild

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-22 18:17:49 +0000
+++ MusicNowPlaying.qml	2014-10-22 19:53:40 +0000
@@ -595,9 +595,7 @@
 
                     MusicRow {
                         id: musicRow
-                        covers: [{art: model.art, album: model.album, author: model.author}]
-                        showCovers: false
-                        coverSize: units.gu(6)
+                        height: parent.height
                         column: Column {
                             Label {
                                 id: trackTitle

=== modified file 'MusicTracks.qml'
--- MusicTracks.qml	2014-10-22 17:46:50 +0000
+++ MusicTracks.qml	2014-10-22 19:53:40 +0000
@@ -163,10 +163,10 @@
 
                 MusicRow {
                     id: musicRow
-                    anchors.verticalCenter: parent.verticalCenter
-                    covers: [{art: model.art}]
-                    coverSize: units.gu(6)
-                    spacing: units.gu(2)
+                    anchors {
+                        verticalCenter: parent.verticalCenter
+                    }
+                    imageSource: {"art": model.art}
                     column: Column {
                         Label {
                             id: trackTitle

=== modified file 'common/ListItemWithActions.qml'
--- common/ListItemWithActions.qml	2014-10-22 17:37:45 +0000
+++ common/ListItemWithActions.qml	2014-10-22 19:53:40 +0000
@@ -337,7 +337,7 @@
     ]
 
     height: defaultHeight
-    clip: height !== defaultHeight
+    //clip: height !== defaultHeight  // CUSTOM
 
     Rectangle {
         id: leftActionView
@@ -352,6 +352,7 @@
         color: UbuntuColors.red
 
         Icon {
+            id: leftActionIcon
             anchors {
                 centerIn: parent
                 horizontalCenterOffset: actionThreshold / 2

=== modified file 'common/MusicRow.qml'
--- common/MusicRow.qml	2014-10-22 18:05:11 +0000
+++ common/MusicRow.qml	2014-10-22 19:53:40 +0000
@@ -28,36 +28,47 @@
         right: parent.right
         rightMargin: units.gu(2)
     }
+    height: units.gu(7)
 
-    property alias covers: coverGrid.covers
-    property bool showCovers: true
     property alias column: columnComponent.sourceComponent
     property real coverSize: styleMusic.common.albumSize
-
-    spacing: units.gu(1)
-
-    CoverGrid {
-        id: coverGrid
+    property var imageSource
+
+    spacing: units.gu(2)
+
+    Image {
+        id: image
         anchors {
             verticalCenter: parent.verticalCenter
-            topMargin: units.gu(0.5)
-            bottomMargin: units.gu(0.5)
-            leftMargin: units.gu(2)
-        }
-        covers: []
-        size: coverSize
-        visible: showCovers
+        }
+        asynchronous: true
+        fillMode: Image.PreserveAspectCrop
+        height: width
+        source: imageSource !== undefined && imageSource !== ""
+                ? (imageSource.art !== undefined
+                   ? imageSource.art
+                   : "image://albumart/artist=" + imageSource.author + "&album=" + imageSource.album)
+                : ""
+        sourceSize.height: height
+        sourceSize.width: width
+        width: units.gu(6)
+
+        onStatusChanged: {
+            if (status === Image.Error) {
+                source = Qt.resolvedUrl("../images/[e-mail]")
+            }
+        }
+        visible: imageSource !== undefined
     }
 
     Loader {
         id: columnComponent
         anchors {
-            top: parent.top
-            topMargin: units.gu(1)
+            verticalCenter: parent.verticalCenter
         }
         asynchronous: true
-        width: !showCovers ? parent.width - parent.spacing
-                           : parent.width - coverGrid.width - parent.spacing
+        width: imageSource === undefined ? parent.width - parent.spacing
+                                         : parent.width - image.width - parent.spacing
 
         onSourceComponentChanged: {
             for (var i=0; i < item.children.length; i++) {

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-10-22 16:23:35 +0000
+++ common/SongsPage.qml	2014-10-22 19:53:40 +0000
@@ -388,8 +388,7 @@
 
                 MusicRow {
                     id: musicRow
-                    covers: []
-                    showCovers: false
+                    height: parent.height
                     column: Column {
                         Label {
                             id: trackTitle