Merge lp:~ibelieve/music-app/improved-nomusic-msg into lp:music-app/trusty

[Michael Spencer]

Improved the no music message

Currently, when there is no music available, a message is displayed explaining what needs to happen. This doesn't make much sense without a message explaining the problem.

This adds a large & bold header stating that there is no music available. This follows the design used in Friends when no accounts are set up.

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

PASSED: Continuous integration, rev:352
http://91.189.93.70:8080/job/music-app-ci/593/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1463
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/593
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/595
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/314

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Thanks Michael! Could you also see what it might take to disable tab navigation while in this state? I think that is also something that should change in relation to the empty state.

review: Needs Fixing

[lp:~ibelieve/music-app/improved-nomusic-msg]

353. By Michael Spencer on 2014-02-22

Only display the Music tab when there is no music

[Michael Spencer (ibelieve)]

The last commit should do what you want. It works the same way that Friends works, by pushing a separate page if there is no music. The back button is removed, so the only way to get the page to go away is to add music.

Which brings up the question, must the app be restarted, or will the app recognize music if it is added? I'm running Ubuntu in a development VM, so I have no easy way to test this.

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

PASSED: Continuous integration, rev:353
http://91.189.93.70:8080/job/music-app-ci/595/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1466
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/595
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/597
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/316

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Currently the app only loads the views upon initialization, so the app would need to be restarted.

review: Approve

[Victor Thompson (vthompson)]

However, if this changes in the future, it is nice that the property change to noMusic will still allow us to go back to the normal state.

[Andrew Hayzen (ahayzen)]

Looks much better than before, the only issue I can see is that if noMusic is calculated as True to start with (so it never changes from false to true) it creates some strange results. This could become more of an issue when we move away from Grilo and we don't get the delay of griloModel.loaded.

Otherwise is there any reason this hasn't been merged?

=== modified file 'music-app.qml'
--- music-app.qml	2014-02-20 12:06:40 +0000
+++ music-app.qml	2014-02-22 17:46:43 +0000
@@ -1116,6 +1116,56 @@
 
     PageStack {
         id: pageStack
+
+        Page {
+            id: emptyPage
+            title: i18n.tr("Music")
+            visible: false
+
+            property bool noMusic: griloModel.count === 0 && griloModel.loaded === true
+
+            onNoMusicChanged: {
+                if (noMusic)
+                    pageStack.push(emptyPage)
+                else if (pageStack.currentPage == emptyPage)
+                    pageStack.pop()
+            }
+
+            tools: ToolbarItems {
+                back: null
+                locked: true
+                opened: false
+            }
+
+            // Overlay to show when no tracks detected on the device
+            Rectangle {
+                id: libraryEmpty
+                anchors.fill: parent
+                anchors.topMargin: -emptyPage.header.height
+                color: styleMusic.libraryEmpty.backgroundColor
+
+                Column {
+                    anchors.centerIn: parent
+
+
+                    Label {
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        color: styleMusic.libraryEmpty.labelColor
+                        fontSize: "large"
+                        font.bold: true
+                        text: "No music found"
+                    }
+
+                    Label {
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        color: styleMusic.libraryEmpty.labelColor
+                        fontSize: "medium"
+                        text: "Please import music and restart the app"
+                    }
+                }
+            }
+        }
+
         Tabs {
             id: tabs
             anchors {
@@ -1132,7 +1182,7 @@
                 id: startTab
                 objectName: "starttab"
                 anchors.fill: parent
-                title: i18n.tr("Music")
+                title: page.title
 
                 // Tab content begins here
                 page: MusicStart {
@@ -1149,7 +1199,7 @@
                 id: artistsTab
                 objectName: "artiststab"
                 anchors.fill: parent
-                title: i18n.tr("Artists")
+                title: page.title
 
                 // tab content
                 page: MusicArtists {
@@ -1166,7 +1216,7 @@
                 id: albumsTab
                 objectName: "albumstab"
                 anchors.fill: parent
-                title: i18n.tr("Albums")
+                title: page.title
 
                 // Tab content begins here
                 page: MusicAlbums {
@@ -1183,7 +1233,7 @@
                 id: tracksTab
                 objectName: "trackstab"
                 anchors.fill: parent
-                title: i18n.tr("Songs")
+                title: page.title
 
                 // Tab content begins here
                 page: MusicTracks {
@@ -1201,7 +1251,7 @@
                 id: playlistTab
                 objectName: "playlisttab"
                 anchors.fill: parent
-                title: i18n.tr("Playlists")
+                title: page.title
 
                 // Tab content begins here
                 page: MusicPlaylists {
@@ -1270,21 +1320,4 @@
         return minutes + ":" + (seconds<10 ? "0"+seconds : seconds);
     }
 
-    // Overlay to show when no tracks detected on the device
-    Rectangle {
-        id: libraryEmpty
-        anchors.fill: parent
-        color: styleMusic.libraryEmpty.backgroundColor
-        visible: griloModel.count === 0 && griloModel.loaded === true
-
-        Label {
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            color: styleMusic.libraryEmpty.labelColor
-            fontSize: "medium"
-            text: "Please import music and restart the app"
-        }
-
-    }
-
 } // end of main view