Merge lp:~ahayzen/music-app/remix-cover-grid into lp:music-app/remix

[Andrew Hayzen]

* Add CoverGrid.qml component
* Use CoverGrid in Card.qml

* Add CoverGrid.qml component
* Use CoverGrid in Card.qml

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

PASSED: Continuous integration, rev:667
http://91.189.93.70:8080/job/music-app-remix-ci/79/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/902
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/902/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/79

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-cover-grid]

668. By Andrew Hayzen on 2014-10-13

* Merge of trunk

[Victor Thompson (vthompson)]

I just have 2 small inline comments that should be addressed. Otherwise, this looks great!

review: Needs Fixing

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

PASSED: Continuous integration, rev:668
http://91.189.93.70:8080/job/music-app-remix-ci/87/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/915
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/915/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/87

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

review: Approve (continuous-integration)

[lp:~ahayzen/music-app/remix-cover-grid]

669. By Andrew Hayzen on 2014-10-13

* Removal of old code

670. By Andrew Hayzen on 2014-10-13

* Fix for typo :(

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

PASSED: Continuous integration, rev:669
http://91.189.93.70:8080/job/music-app-remix-ci/88/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/916
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/916/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/88

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:670
http://91.189.93.70:8080/job/music-app-remix-ci/90/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/918
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/918/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/90

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM, Thanks!

review: Approve

=== modified file 'MusicAlbums.qml'
--- MusicAlbums.qml	2014-10-07 12:58:24 +0000
+++ MusicAlbums.qml	2014-10-13 16:35:43 +0000
@@ -42,7 +42,7 @@
         }
         delegate: Card {
             id: albumCard
-            imageSource: model.art
+            coverSources: [{art: model.art}]
             objectName: "albumsPageGridItem" + index
             primaryText: model.title
             secondaryText: model.artist

=== modified file 'MusicArtists.qml'
--- MusicArtists.qml	2014-10-13 13:05:59 +0000
+++ MusicArtists.qml	2014-10-13 16:35:43 +0000
@@ -46,7 +46,7 @@
         }
         delegate: Card {
             id: artistCard
-            imageSource: "image://artistart/artist=" + model.artist + "&album=" + artistCard.album
+            coverSources: [{art: "image://artistart/artist=" + model.artist + "&album=" + artistCard.album}]
             objectName: "artistsPageGridItem" + index
             primaryText: model.artist
             secondaryTextVisible: false

=== modified file 'common/Card.qml'
--- common/Card.qml	2014-10-11 03:20:48 +0000
+++ common/Card.qml	2014-10-13 16:35:43 +0000
@@ -24,7 +24,7 @@
     color: "transparent"
     height: cardColumn.childrenRect.height + 2 * bg.anchors.margins
 
-    property alias imageSource: image.source
+    property alias coverSources: coverGrid.covers
     property alias primaryText: primaryLabel.text
     property alias secondaryText: secondaryLabel.text
     property alias secondaryTextVisible: secondaryLabel.visible
@@ -75,16 +75,9 @@
         }
         spacing: units.gu(0.5)
 
-        Image {
-            id: image
-            height: parent.width
-            width: parent.width
-
-            onStatusChanged: {
-                if (status === Image.Error) {
-                    source = Qt.resolvedUrl("../images/[e-mail]")
-                }
-            }
+        CoverGrid {
+            id: coverGrid
+            size: parent.width
         }
 
         Rectangle {

=== added file 'common/CoverGrid.qml'
--- common/CoverGrid.qml	1970-01-01 00:00:00 +0000
+++ common/CoverGrid.qml	2014-10-13 16:35:43 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2013, 2014
+ *      Andrew Hayzen <[e-mail]>
+ *      Nekhelesh Ramananthan <[e-mail]>
+ *      Victor Thompson <[e-mail]>
+ *
+ * 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.3
+import Ubuntu.Components 1.1
+
+Rectangle {
+    id: coverGrid
+    color: "transparent"
+    height: size
+    width: size
+
+    // Property (array) to store the cover images
+    property var covers
+
+    // Property to set the size of the cover image
+    property int size
+
+    onCoversChanged: {
+        if (covers !== undefined) {
+            while (covers.length > 4) {  // remove any covers after 4
+                covers.pop()
+            }
+        }
+    }
+
+    // Flow of the cover arts in either 1, 1x1, 2x1, 2x2
+    Flow {
+        id: imageRow
+        anchors {
+            fill: parent
+        }
+
+        Repeater {
+            id: repeat
+            model: coverGrid.covers.length === 0 ? 1 : coverGrid.covers.length
+            delegate: Image {
+                fillMode: Image.PreserveAspectCrop
+                height: coverGrid.size / (coverGrid.covers.length > 1 ? 2 : 1)
+                width: coverGrid.size / (coverGrid.covers.length > 2 && !(coverGrid.covers.length === 3 && index === 2) ? 2 : 1)
+                source: coverGrid.covers.length !== 0 && coverGrid.covers[index] !== "" && coverGrid.covers[index] !== undefined
+                        ? (coverGrid.covers[index].art !== undefined
+                           ? coverGrid.covers[index].art
+                           : "image://albumart/artist=" + coverGrid.covers[index].author + "&album=" + coverGrid.covers[index].album)
+                        : Qt.resolvedUrl("../images/[e-mail]")
+                onStatusChanged: {
+                    if (status === Image.Error) {
+                        source = Qt.resolvedUrl("../images/[e-mail]")
+                    }
+                }
+            }
+        }
+    }
+}
+