Merge lp:~vthompson/music-app/remix-empty-states-001 into lp:music-app/remix

[Victor Thompson]

Initial empty state prototype

This is the first drop additional empty state pages for 1) playlists, 2) recent items.

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

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

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-empty-states-001]

679. By Victor Thompson on 2014-10-20

merge of remix and fix issues

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

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

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-empty-states-001]

680. By Victor Thompson on 2014-10-21

Wait until model is loaded before showing empty state

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

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

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/remix-empty-states-001]

681. By Victor Thompson on 2014-10-21

Fix bad check

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Please apply this diff to remove the flicker

=== modified file LibraryListModel.qml
--- LibraryListModel.qml 2014-09-20 10:50:45 +0000
+++ LibraryListModel.qml 2014-10-21 21:36:46 +0000
@@ -33,6 +33,7 @@
     property var param: null
     property bool canLoad: true
     property bool preLoadComplete: false
+ property alias workerComplete: worker.completed

     onCanLoadChanged: {
         /* If canLoad has been set back to true then check if there are any

=== modified file music-app.qml
--- music-app.qml 2014-10-21 18:30:27 +0000
+++ music-app.qml 2014-10-21 21:36:46 +0000
@@ -1156,8 +1156,8 @@
         visible: noMusic || noPlaylists || noRecent

         property bool noMusic: allSongsModel.rowCount === 0 && allSongsModel.status === SongsModel.Ready && loadedUI
- property bool noPlaylists: playlistModel.model.count === 0 && playlistModel.complete
- property bool noRecent: recentModel.model.count === 0 && recentModel.complete
+ property bool noPlaylists: playlistModel.model.count === 0 && playlistModel.workerComplete
+ property bool noRecent: recentModel.model.count === 0 && recentModel.workerComplete
 tools: ToolbarItems {
             back: null
             locked: true

review: Needs Fixing

[Andrew Hayzen (ahayzen)]

1 inline comment

[lp:~vthompson/music-app/remix-empty-states-001]

682. By Victor Thompson on 2014-10-21

update checks to prevent flicker

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM the flicker has gone :)

review: Approve

=== modified file 'LibraryListModel.qml'
--- LibraryListModel.qml	2014-09-20 10:50:45 +0000
+++ LibraryListModel.qml	2014-10-21 21:58:19 +0000
@@ -29,6 +29,7 @@
         property var linkLibraryListModel: libraryListModelItem
     }
     property alias count: libraryModel.count
+    property alias workerComplete: worker.completed
     property var query: null
     property var param: null
     property bool canLoad: true

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-21 14:59:51 +0000
+++ music-app.qml	2014-10-21 21:58:19 +0000
@@ -1170,10 +1170,11 @@
     Page {
         id: emptyPage
         title: i18n.tr("Music")
-        visible: noMusic
+        visible: noMusic || noPlaylists || noRecent
 
         property bool noMusic: allSongsModel.rowCount === 0 && allSongsModel.status === SongsModel.Ready && loadedUI
-
+        property bool noPlaylists: playlistModel.model.count === 0 && playlistModel.workerComplete
+        property bool noRecent: recentModel.model.count === 0 && recentModel.workerComplete
         tools: ToolbarItems {
             back: null
             locked: true
@@ -1185,7 +1186,8 @@
             id: libraryEmpty
             anchors.fill: parent
             anchors.topMargin: -emptyPage.header.height
-            color: styleMusic.libraryEmpty.backgroundColor
+            color: mainView.backgroundColor
+            visible: emptyPage.noMusic
 
             Column {
                 anchors.centerIn: parent
@@ -1206,6 +1208,63 @@
                 }
             }
         }
+
+        // Overlay to show when no playlists are on the device
+        Rectangle {
+            id: playlistsEmpty
+            anchors.fill: parent
+            anchors.topMargin: -emptyPage.header.height
+            color: mainView.backgroundColor
+            visible: emptyPage.noPlaylists && !emptyPage.noMusic && tabs.selectedTab.index === 4
+
+            Column {
+                anchors.centerIn: parent
+
+                Label {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: styleMusic.libraryEmpty.labelColor
+                    fontSize: "large"
+                    font.bold: true
+                    text: i18n.tr("No playlists found")
+                }
+
+                Label {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: styleMusic.libraryEmpty.labelColor
+                    fontSize: "medium"
+                    text: i18n.tr("Click the + to create a playlist")
+                }
+            }
+        }
+
+        // Overlay to show when no recent items are on the device
+        Rectangle {
+            id: recentEmpty
+            anchors.fill: parent
+            anchors.topMargin: -emptyPage.header.height
+            color: mainView.backgroundColor
+            visible: emptyPage.noRecent && !emptyPage.noMusic && tabs.selectedTab.index === 0
+
+            Column {
+                anchors.centerIn: parent
+
+                Label {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: styleMusic.libraryEmpty.labelColor
+                    fontSize: "large"
+                    font.bold: true
+                    text: i18n.tr("No recent albums or playlists found")
+                }
+
+                Label {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: styleMusic.libraryEmpty.labelColor
+                    fontSize: "medium"
+                    text: i18n.tr("Play some music to see your favorites")
+                }
+            }
+        }
+
     }
 
     LoadingSpinnerComponent {