Merge lp:~ahayzen/music-app/remix-toolbar-always-now-playing-full into lp:music-app/remix

[Andrew Hayzen]

* From the toolbar always jump to full view (eg if toolbar is selected in queue view jump to full)

* From the toolbar always jump to full view (eg if toolbar is selected in queue view jump to full)

Currently clicking on the toolbar will result in you ended up on the now playing full page, however if you are on the now playing list page nothing happens. This makes sure that clicking the toolbar always ends up in the same place.

<ahayzen> jounih, so on this page https://drive.google.com/file/d/0B3XynHVKfrvMR1JMSEJVM3R3WWM
<ahayzen> jounih, if i click in the toolbar should it jump to...
<ahayzen> jounih, this page https://drive.google.com/file/d/0B3XynHVKfrvMZm0yZUR0dFZFemc
<jounih> yes
<ahayzen> jounih, cool thanks :)
<jounih> however, if you click any of those listitems in the queue view, no it shouldnt jump

[Victor Thompson (vthompson)]

I noticed the same thing. I like the change. Would it make more sense to consolidate all the calls to reset isListView such that it is done under pushNowPlaying() in music-app.qml?

review: Needs Information

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

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

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

I thought about putting it in pushNowPlaying() but that should be covered by the onVisibleChanged, unless I remove the setting of isListView there and change it to in pushNowPlaying() ?

review: Approve

[Andrew Hayzen (ahayzen)]

Arg damn hit approve lol.

review: Abstain

[Victor Thompson (vthompson)]

That's what I meant as well, I'm just not 100% moving this to pushNowPlaying would catch all instances or not (can't test at the moment).

[lp:~ahayzen/music-app/remix-toolbar-always-now-playing-full]

657. By Andrew Hayzen on 2014-10-08

* Move call to inside pushNowPlaying()

658. By Andrew Hayzen on 2014-10-08

* Ensure all instances use pushNowPlaying()

[Victor Thompson (vthompson)]

LGTM!

review: Approve

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

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

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

review: Approve (continuous-integration)

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-10-07 14:13:28 +0000
+++ MusicNowPlaying.qml	2014-10-08 18:37:40 +0000
@@ -32,12 +32,6 @@
     objectName: "nowPlayingPage"
     title: i18n.tr("Now Playing")
     visible: false
-    onVisibleChanged: {
-        if (!visible) {
-            // Reset the isListView property
-            isListView = false
-        }
-    }
 
     property int ensureVisibleIndex: 0  // ensure first index is visible at startup
     property bool isListView: false

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-06 02:18:23 +0000
+++ music-app.qml	2014-10-08 18:37:40 +0000
@@ -89,11 +89,11 @@
                 }
                 break;
             case Qt.Key_J:  //      Ctrl+J      Jump to playing song
-                nowPlaying.visible = true;
+                tabs.pushNowPlaying()
                 nowPlaying.positionAt(player.currentIndex);
                 break;
             case Qt.Key_N:  //      Ctrl+N      Show now playing
-                nowPlaying.visible = true;
+                tabs.pushNowPlaying()
                 break;
             case Qt.Key_P:  //      Ctrl+P      Toggle playing state
                 player.toggle();
@@ -1099,6 +1099,8 @@
                 if (mainPageStack.currentPage !== nowPlaying) {
                     mainPageStack.push(nowPlaying);
                 }
+
+                nowPlaying.isListView = false;  // ensure full view
             }
 
             Component.onCompleted: musicToolbar.currentTab = selectedTab