Ubuntu Music App

Merge lp:~vthompson/music-app/remix-hide-empty-states-when-now-playing into lp:music-app/remix

  1. remix-hide-empty-states-when-now-playing
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 702
Merged at revision: 702
Proposed branch: lp:~vthompson/music-app/remix-hide-empty-states-when-now-playing
Merge into: lp:music-app/remix
Diff against target: 14 lines (+2/-2)
1 file modified
music-app.qml (+2/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-hide-empty-states-when-now-playing
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+239633@code.launchpad.net

Commit message

* Hide empty state when in Now Playing or Queue

Description of the change

Currently in remix if you have no Recent items or no Playlists, if you click the toolbar to navigate to Now playing or the Queue, the empty state pages block the view. They need to not be visible when the now playing or queue view is shown.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'music-app.qml'
2--- music-app.qml 2014-10-24 12:41:57 +0000
3+++ music-app.qml 2014-10-25 03:01:50 +0000
4@@ -1045,8 +1045,8 @@
5 visible: noMusic || noPlaylists || noRecent
6
7 property bool noMusic: allSongsModel.rowCount === 0 && allSongsModel.status === SongsModel.Ready && loadedUI
8- property bool noPlaylists: playlistModel.model.count === 0 && playlistModel.workerComplete
9- property bool noRecent: recentModel.model.count === 0 && recentModel.workerComplete
10+ property bool noPlaylists: playlistModel.model.count === 0 && playlistModel.workerComplete && mainPageStack.currentPage.title !== i18n.tr("Now playing") && mainPageStack.currentPage.title !== i18n.tr("Queue")
11+ property bool noRecent: recentModel.model.count === 0 && recentModel.workerComplete && mainPageStack.currentPage.title !== i18n.tr("Now playing") && mainPageStack.currentPage.title !== i18n.tr("Queue")
12 tools: ToolbarItems {
13 back: null
14 locked: true

Subscribers

People subscribed via source and target branches