Merge lp:~ahayzen/music-app/now-playing-to-tab into lp:music-app/trusty

[Andrew Hayzen]

* Move now playing into its own tab

Move now playing into its own tab

[Victor Thompson (vthompson)]

Let's not merge this until we've reviewed the community design(s).

review: Needs Information

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

FAILED: Continuous integration, rev:364
http://91.189.93.70:8080/job/music-app-ci/614/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1570
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/614
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/616
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/335

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

364. By Andrew Hayzen on 2014-03-03

* Add empty state to now playing page

363. By Andrew Hayzen on 2014-03-03

* Fix for missed case of showing nowPlaying

362. By Andrew Hayzen on 2014-03-03

* Remove back page as now using tabs

361. By Andrew Hayzen on 2014-03-03

* Initial changes to move now playing to tab

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-02-22 22:12:21 +0000
+++ MusicNowPlaying.qml	2014-03-03 22:50:43 +0000
@@ -31,22 +31,12 @@
     id: nowPlaying
     objectName: "nowplayingpage"
     anchors.fill: parent
-    title: i18n.tr("Queue")
-    visible: false
+    title: i18n.tr("Now Playing")
 
     onVisibleChanged: {
         if (visible === true)
         {
-            header.hide();
-            header.opacity = 0;
-            header.enabled = false;
-            musicToolbar.setPage(nowPlaying, musicToolbar.currentPage);
-        }
-        else
-        {
-            header.enabled = true;
-            header.opacity = 1;
-            header.show();
+            musicToolbar.setPage(nowPlaying);
         }
     }
 
@@ -89,17 +79,36 @@
         customdebug("MusicQueue update currentIndex: " + file);
     }
 
+    Column {
+        anchors.centerIn: parent
+        visible: trackQueue.isEmpty === true
+        Label {
+            anchors.horizontalCenter: parent.horizontalCenter
+            color: styleMusic.libraryEmpty.labelColor
+            fontSize: "large"
+            font.bold: true
+            text: "No songs queued"
+        }
+
+        Label {
+            anchors.horizontalCenter: parent.horizontalCenter
+            color: styleMusic.libraryEmpty.labelColor
+            fontSize: "medium"
+            text: "Tap on a song to start playing"
+        }
+    }
+
     ListView {
         id: queuelist
         objectName: "queuelist"
         anchors.fill: parent
         anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
-        anchors.topMargin: nowPlayingBackButton.height
         spacing: units.gu(1)
         delegate: queueDelegate
         model: trackQueue.model
         highlightFollowsCurrentItem: false
         state: "normal"
+        visible: trackQueue.isEmpty === false
         states: [
             State {
                 name: "normal"
@@ -803,68 +812,4 @@
             }
         }
     }
-
-    Rectangle {
-        id: nowPlayingBackButton
-        anchors.left: parent.left
-        anchors.right: parent.right
-        color: styleMusic.toolbar.fullBackgroundColor
-        height: units.gu(3.1)
-
-        state: musicToolbar.opened ? "shown" : "hidden"
-        states: [
-            State {
-                name: "shown"
-                PropertyChanges {
-                    target: nowPlayingBackButton
-                    y: 0
-                }
-            },
-            State {
-                name: "hidden"
-                PropertyChanges {
-                    target: nowPlayingBackButton
-                    y: -height
-                }
-            }
-        ]
-
-        transitions: Transition {
-             from: "hidden,shown"
-             to: "shown,hidden"
-             NumberAnimation {
-                 duration: 100
-                 properties: "y"
-             }
-         }
-
-        Image {
-            id: expandItem
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            source: "images/dropdown-menu.svg"
-            height: units.gu(2)
-            width: height
-        }
-
-        MouseArea {
-            objectName: "nowPlayingBackButtonObject"
-            anchors.fill: parent
-
-            onClicked: {
-                collapseSwipeDelete(-1);  // collapse all expands
-                musicToolbar.goBack();
-            }
-        }
-
-        /* Border at the bottom */
-        Rectangle {
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            color: styleMusic.common.white
-            height: units.gu(0.1)
-            opacity: 0.2
-        }
-    }
 }

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2014-02-22 19:59:15 +0000
+++ MusicToolbar.qml	2014-03-03 22:50:43 +0000
@@ -479,7 +479,7 @@
                     MouseArea {
                         anchors.fill: parent
                         onClicked: {
-                            nowPlaying.visible = true
+                            tabs.selectedTabIndex = nowPlayingTab.index;
                         }
                     }
 
@@ -614,7 +614,7 @@
                 }
                 enabled: !trackQueue.isEmpty
                 onClicked: {
-                    nowPlaying.visible = true;
+                    tabs.selectedTabIndex = nowPlayingTab.index;
                 }
             }
 

=== modified file 'music-app.qml'
--- music-app.qml	2014-02-24 00:16:55 +0000
+++ music-app.qml	2014-03-03 22:50:43 +0000
@@ -471,7 +471,7 @@
                     player.pause()
                 } else { // We are not on the now playing page
                     // Show the Now Playing page and make sure the track is visible
-                    nowPlaying.visible = true;
+                    tabs.selectedTabIndex = nowPlayingTab.index;
                     nowPlaying.ensureVisibleIndex = index;
 
                     musicToolbar.showToolbar();
@@ -482,7 +482,7 @@
                 player.play()
 
                 // Show the Now Playing page and make sure the track is visible
-                nowPlaying.visible = true;
+                tabs.selectedTabIndex = nowPlayingTab.index;
                 nowPlaying.ensureVisibleIndex = index;
 
                 musicToolbar.showToolbar();
@@ -526,7 +526,7 @@
         if (play === true)
         {
             // Show the Now Playing page and make sure the track is visible
-            nowPlaying.visible = true;
+            tabs.selectedTabIndex = nowPlayingTab.index;
             nowPlaying.ensureVisibleIndex = index;
 
             musicToolbar.showToolbar();
@@ -1265,6 +1265,22 @@
                 }
             }
 
+            Tab {
+                property bool populated: true
+                property var loader: []
+                property bool loading: false
+                property var model: []
+                id: nowPlayingTab
+                anchors {
+                    fill: parent
+                }
+                objectName: "nowplayingtab"
+                title: page.title
+                page: MusicNowPlaying {
+                    id: nowPlaying
+                }
+            }
+
             // Set the models in the tab to allow/disallow loading
             function allowLoading(tabToLoad, state)
             {
@@ -1311,10 +1327,6 @@
         } // end of tabs
     }
 
-    MusicNowPlaying {
-        id: nowPlaying
-    }
-
     MusicaddtoPlaylist {
         id: addtoPlaylist
     }