Merge lp:~vthompson/music-app/remix-genres-tab-001 into lp:music-app/remix

[Victor Thompson]

Add an initial Genres tab

Add an initial Genres tab and CoverGrid for each genre.

[lp:~vthompson/music-app/remix-genres-tab-001]

683. By Victor Thompson on 2014-10-21

Add MusicGenre component.

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Awesome :) we should investigate using the filter.pattern: /\S+/ for the Albums and Artists models

review: Approve

=== added file 'MusicGenres.qml'
--- MusicGenres.qml	1970-01-01 00:00:00 +0000
+++ MusicGenres.qml	2014-10-21 15:09:22 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2013, 2014
+ *      Andrew Hayzen <[e-mail]>
+ *      Daniel Holm <[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
+import Ubuntu.MediaScanner 0.1
+import "common"
+
+
+MusicPage {
+    id: mainpage
+    objectName: "genresPage"
+    title: i18n.tr("Genres")
+
+    CardView {
+        id: genreCardView
+        itemWidth: units.gu(12)
+        model: SortFilterModel {
+            id: genresModelFilter
+            model: GenresModel {
+                id: genresModel
+                store: musicStore
+            }
+            filter.property: "genre"
+            filter.pattern: /\S+/
+        }
+
+        delegate: Card {
+            id: genreCard
+            coverSources: []
+            objectName: "genresPageGridItem" + index
+            primaryText: model.genre
+            secondaryTextVisible: false
+
+            property string album: ""
+
+            AlbumsModel {
+                id: albumGenreModel
+                genre: model.genre
+                store: musicStore
+            }
+
+            Repeater {
+                id: albumGenreModelRepeater
+                model: AlbumsModel {
+                    genre: model.genre
+                    store: musicStore
+                }
+
+                delegate: Item {
+                    property string art: model.art
+                }
+                property var covers: []
+                signal finished()
+
+                onFinished: {
+                    genreCard.coverSources = covers
+                }
+                onItemAdded: {
+                    covers.push({art: item.art});
+
+                    if (index === count - 1) {
+                        finished();
+                    }
+                }
+            }
+
+            onClicked: {
+                songsPage.covers = genreCard.coverSources
+                songsPage.album = undefined
+                songsPage.isAlbum = true
+                songsPage.genre = model.genre;
+                songsPage.title = i18n.tr("Genre")
+                songsPage.line2 = model.genre
+                songsPage.line1 = i18n.tr("Genre")
+
+
+                mainPageStack.push(songsPage)
+            }
+        }
+    }
+}
+

=== modified file 'common/CoverGrid.qml'
--- common/CoverGrid.qml	2014-10-20 15:56:44 +0000
+++ common/CoverGrid.qml	2014-10-21 15:09:22 +0000
@@ -60,7 +60,7 @@
                         ? (coverGrid.covers[index].art !== undefined
                            ? coverGrid.covers[index].art
                            : "image://albumart/artist=" + coverGrid.covers[index].author + "&album=" + coverGrid.covers[index].album)
-                        : undefined
+                        : ""
                 sourceSize.height: height
                 sourceSize.width: width
 

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-20 14:09:45 +0000
+++ music-app.qml	2014-10-21 15:09:22 +0000
@@ -1041,6 +1041,23 @@
                 }
             }
 
+            // forth tab is genres
+            Tab {
+                property bool populated: true
+                property var loader: []
+                property bool loading: false
+                property var model: []
+                id: genresTab
+                objectName: "genresTab"
+                anchors.fill: parent
+                title: page.title
+
+                // Tab content begins here
+                page: MusicGenres {
+                    id: musicGenresPage
+                }
+            }
+
             // fourth tab is all songs
             Tab {
                 property bool populated: true