Merge lp:~vthompson/music-app/music-uc1.3-now-playing-fix-1447428 into lp:music-app

[Victor Thompson]

* Add initial page sections to Now Playing view

* Add initial page sections to Now Playing view

This adds a Now Playing toggle to the Now Playing view, using the newer Page Head Sections API. This has been approved by Design.

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

PASSED: Continuous integration, rev:908
http://91.189.93.70:8080/job/music-app-ci/1399/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/251

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/music-uc1.3-now-playing-fix-1447428]

909. By Victor Thompson on 2015-11-02

Merge trunk and resolve conflicts.

910. By Victor Thompson on 2015-11-02

Add FIXME.

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

PASSED: Continuous integration, rev:910
http://91.189.93.70:8080/job/music-app-ci/1411/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/263

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/music-uc1.3-now-playing-fix-1447428]

911. By Victor Thompson on 2015-11-03

Merge trunk and resolve conflicts.

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

PASSED: Continuous integration, rev:911
http://91.189.93.70:8080/job/music-app-ci/1414/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/266

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/music-uc1.3-now-playing-fix-1447428]

912. By Victor Thompson on 2015-11-03

Fix AP.

[Victor Thompson (vthompson)]

Tests running...

Ran 19 tests in 259.503s
OK

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

PASSED: Continuous integration, rev:912
http://91.189.93.70:8080/job/music-app-ci/1415/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/267

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

One inline comment

review: Needs Information

[Andrew Hayzen (ahayzen)]

Also would be really really nice if we could centre align the head sections, wonder if that is something we can request?

[Andrew Hayzen (ahayzen)]

When you switch from the Queue -> Full View I think it should set the state back to normal, so that it disables any multiselects that have happened.

[Victor Thompson (vthompson)]

As for centering the sections, we should talk to the SDK and Design teams to see how they envision apps making this visible. I assumed having them left justified was preferred, but for something like this (a view toggle) centering the section items seems like a decent idea.

[lp:~vthompson/music-app/music-uc1.3-now-playing-fix-1447428]

913. By Victor Thompson on 2015-11-05

Remove onVisibleChanged and add code to close multiselection.

[Victor Thompson (vthompson)]

I'm not sure why I added the onVisibleChanged handler. I've removed it to fix the playlist add issue. I've also made it so multiselect will be close when toggling.

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

PASSED: Continuous integration, rev:913
http://91.189.93.70:8080/job/music-app-ci/1416/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/268

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

#blocked on lp:1511839 landing in ota8

[Andrew Hayzen (ahayzen)]

One inline comment, if pushNowPlaying() is called, it needs to be ensured that the Full View is selected as this could be called via uri-handler but in the queue view.

review: Needs Fixing

[lp:~vthompson/music-app/music-uc1.3-now-playing-fix-1447428]

914. By Victor Thompson on 2015-11-16

Resolve comment.

[Andrew Hayzen (ahayzen)]

LGTM, nice to make use of the new uc1.3 components and get rid of the confusing/ambiguous header action :-)

review: Approve

[lp:~vthompson/music-app/music-uc1.3-now-playing-fix-1447428]

915. By Victor Thompson on 2015-11-16

Merge trunk and resolve conflict

[Victor Thompson (vthompson)]

Tests running...
/usr/lib/python3/dist-packages/gi/overrides/Gtk.py:1554: Warning: g_object_ref: assertion 'G_IS_OBJECT (object)' failed
  initialized, argv = Gtk.init_check(sys.argv)

Ran 19 tests in 242.214s
OK

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/music-app.qml'
--- app/music-app.qml	2015-10-28 01:05:33 +0000
+++ app/music-app.qml	2015-11-16 02:01:16 +0000
@@ -369,7 +369,7 @@
 
         if (!clear) {
             // If same track and on Now playing page then toggle
-            if ((mainPageStack.currentPage.title === i18n.tr("Now playing") || mainPageStack.currentPage.title === i18n.tr("Queue"))
+            if (mainPageStack.currentPage.title === i18n.tr("Now playing")
                     && trackQueue.model.get(player.currentIndex) !== undefined
                     && Qt.resolvedUrl(trackQueue.model.get(player.currentIndex).filename) === file) {
                 player.toggle()
@@ -399,11 +399,6 @@
         else {
             player.playSong(trackQueue.model.get(index).filename, index);
         }
-
-        // Show the Now playing page and make sure the track is visible
-        if (mainPageStack.currentPage.title !== i18n.tr("Queue")) {
-            tabs.pushNowPlaying();
-        }
     }
 
     function playRandomSong(shuffle)
@@ -984,12 +979,11 @@
             function pushNowPlaying()
             {
                 // only push if on a different page
-                if (mainPageStack.currentPage.title !== i18n.tr("Now playing")
-                        && mainPageStack.currentPage.title !== i18n.tr("Queue")) {
+                if (mainPageStack.currentPage.title !== i18n.tr("Now playing")) {
                     mainPageStack.push(Qt.resolvedUrl("ui/NowPlaying.qml"), {})
                 }
 
-                if (mainPageStack.currentPage.title === i18n.tr("Queue")) {
+                if (mainPageStack.currentPage.isListView === true) {
                     mainPageStack.currentPage.isListView = false;  // ensure full view
                 }
             }

=== modified file 'app/ui/NowPlaying.qml'
--- app/ui/NowPlaying.qml	2015-10-28 01:05:33 +0000
+++ app/ui/NowPlaying.qml	2015-11-16 02:01:16 +0000
@@ -30,13 +30,15 @@
     flickable: isListView ? queueListLoader.item : null  // Ensures that the header is shown in fullview
     objectName: "nowPlayingPage"
     showToolbar: false
-    title: isListView ? queueTitle : nowPlayingTitle
+    title: nowPlayingTitle
     visible: false
 
     property bool isListView: false
     // TRANSLATORS: this appears in the header with limited space (around 20 characters)
     property string nowPlayingTitle: i18n.tr("Now playing") 
     // TRANSLATORS: this appears in the header with limited space (around 20 characters)
+    property string fullViewTitle: i18n.tr("Full view") 
+    // TRANSLATORS: this appears in the header with limited space (around 20 characters)
     property string queueTitle: i18n.tr("Queue") 
 
     onIsListViewChanged: {
@@ -51,6 +53,9 @@
                     }
                 })
             }
+        } else {
+            // Close multiselection mode.
+            queueListLoader.item.closeSelection()
         }
     }
 
@@ -72,6 +77,20 @@
         queueListLoader.item.positionViewAtIndex(index, ListView.Center);
     }
 
+    PageHeadSections {
+        id: defaultStateSections
+        model: [fullViewTitle, queueTitle]
+        selectedIndex: isListView
+    }
+
+    head {
+        sections {
+            model: defaultStateSections.model
+            selectedIndex: defaultStateSections.selectedIndex
+            onSelectedIndexChanged: isListView = !isListView
+        }
+    }
+
     state: isListView && queueListLoader.item.state === "multiselectable" ? "selection" : "default"
     states: [
         PageHeadState {
@@ -80,13 +99,6 @@
             name: "default"
             actions: [
                 Action {
-                    objectName: "toggleView"
-                    iconName: isListView ? "stock_image" : "view-list-symbolic"
-                    onTriggered: {
-                        isListView = !isListView
-                    }
-                },
-                Action {
                     enabled: trackQueue.model.count > 0
                     iconName: "add-to-playlist"
                     // TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
@@ -138,9 +150,12 @@
             left: parent.left
             right: parent.right
             top: parent.top
-            topMargin: units.gu(6.125)  // FIXME: 6.125 is the header.height
+            topMargin: headerHeight
         }
-        height: parent.height - units.gu(6.125) - units.gu(9.5)  // FIXME: 6.125 is the header.height
+
+        property real headerHeight: units.gu(10.125) // FIXME: 10.125 is the header.height with the page sections
+
+        height: parent.height - headerHeight - units.gu(9.5)
         source: "../components/NowPlayingFullView.qml"
         visible: !isListView
     }

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-03 02:44:19 +0000
+++ debian/changelog	2015-11-16 02:01:16 +0000
@@ -9,6 +9,7 @@
   * Update canned mediastore.db schema version from 8 to 9 (LP: #1511585).
   * Update canned mediastore.db schema version from 9 to 10.
   * Add directions for updating and debugging schema version changes.
+  * Add initial page sections to Now Playing view (LP: #1447428)
 
   [ Andrew Hayzen ]
   * Switch to using the new uc1.3 listitems within the SDK

=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2015-08-21 19:41:03 +0000
+++ po/com.ubuntu.music.pot	2015-11-16 02:01:16 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 20:40+0100\n"
+"POT-Creation-Date: 2015-10-24 14:06-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -37,7 +37,7 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../app/components/Dialog/ContentHubWaitDialog.qml:34
+#: ../app/components/Dialog/ContentHubWaitDialog.qml:33
 msgid "Waiting for file(s)..."
 msgstr ""
 
@@ -83,7 +83,7 @@
 msgstr ""
 
 #: ../app/components/Dialog/RemovePlaylistDialog.qml:37
-#: ../app/components/ListItemActions/Remove.qml:28
+#: ../app/components/ListItemActions/Remove.qml:27
 msgid "Remove"
 msgstr ""
 
@@ -94,7 +94,7 @@
 #. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
 #: ../app/components/HeadState/MultiSelectHeadState.qml:39
 #: ../app/components/ListItemActions/AddToPlaylist.qml:26
-#: ../app/ui/NowPlaying.qml:93
+#: ../app/ui/NowPlaying.qml:108
 msgid "Add to playlist"
 msgstr ""
 
@@ -180,11 +180,11 @@
 msgid "Shuffle"
 msgstr ""
 
-#: ../app/components/Walkthrough/Slide1.qml:58
+#: ../app/components/Walkthrough/Slide1.qml:59
 msgid "Welcome to Music"
 msgstr ""
 
-#: ../app/components/Walkthrough/Slide1.qml:72
+#: ../app/components/Walkthrough/Slide1.qml:73
 msgid ""
 "Enjoy your favorite music with Ubuntu's Music App. Take a short tour on how "
 "to get started or press skip to start listening now."
@@ -195,7 +195,7 @@
 msgstr ""
 
 #: ../app/components/Walkthrough/Slide2.qml:67
-#: ../app/ui/LibraryEmptyState.qml:117
+#: ../app/ui/LibraryEmptyState.qml:123
 msgid ""
 "Connect your device to any computer and simply drag files to the Music "
 "folder or insert removable media with music."
@@ -213,84 +213,78 @@
 msgid "Start"
 msgstr ""
 
-#: ../app/components/Walkthrough/Walkthrough.qml:84
+#: ../app/components/Walkthrough/Walkthrough.qml:120
 msgid "Skip"
 msgstr ""
 
-#: ../app/music-app.qml:155
+#: ../app/music-app.qml:156
 msgid "Next"
 msgstr ""
 
-#: ../app/music-app.qml:156
+#: ../app/music-app.qml:157
 msgid "Next Track"
 msgstr ""
 
-#: ../app/music-app.qml:162
+#: ../app/music-app.qml:163
 msgid "Pause"
 msgstr ""
 
-#: ../app/music-app.qml:162
+#: ../app/music-app.qml:163
 msgid "Play"
 msgstr ""
 
-#: ../app/music-app.qml:164
+#: ../app/music-app.qml:165
 msgid "Pause Playback"
 msgstr ""
 
-#: ../app/music-app.qml:164
+#: ../app/music-app.qml:165
 msgid "Continue or start playback"
 msgstr ""
 
-#: ../app/music-app.qml:169
+#: ../app/music-app.qml:170
 msgid "Back"
 msgstr ""
 
-#: ../app/music-app.qml:170
+#: ../app/music-app.qml:171
 msgid "Go back to last page"
 msgstr ""
 
-#: ../app/music-app.qml:178
+#: ../app/music-app.qml:179
 msgid "Previous"
 msgstr ""
 
-#: ../app/music-app.qml:179
+#: ../app/music-app.qml:180
 msgid "Previous Track"
 msgstr ""
 
-#: ../app/music-app.qml:184
+#: ../app/music-app.qml:185
 msgid "Stop"
 msgstr ""
 
-#: ../app/music-app.qml:185
+#: ../app/music-app.qml:186
 msgid "Stop Playback"
 msgstr ""
 
-#: ../app/music-app.qml:276 com.ubuntu.music_music.desktop.in.in.h:1
+#: ../app/music-app.qml:277 com.ubuntu.music_music.desktop.in.in.h:1
 msgid "Music"
 msgstr ""
 
-#: ../app/music-app.qml:306
+#: ../app/music-app.qml:307
 msgid "Debug: "
 msgstr ""
 
 #. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/music-app.qml:371 ../app/music-app.qml:986
+#: ../app/music-app.qml:372 ../app/music-app.qml:982
 #: ../app/ui/NowPlaying.qml:38
 msgid "Now playing"
 msgstr ""
 
 #. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/music-app.qml:371 ../app/music-app.qml:403 ../app/music-app.qml:987
-#: ../app/music-app.qml:991 ../app/ui/NowPlaying.qml:40
-msgid "Queue"
-msgstr ""
-
-#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
-#: ../app/ui/AddToPlaylist.qml:46
+#: ../app/ui/AddToPlaylist.qml:45
 msgid "Select playlist"
 msgstr ""
 
-#: ../app/ui/AddToPlaylist.qml:94 ../app/ui/Playlists.qml:87
+#: ../app/ui/AddToPlaylist.qml:93 ../app/ui/Playlists.qml:86
 #: ../app/ui/SongsView.qml:292 ../app/ui/SongsView.qml:293
 #, qt-format
 msgid "%1 song"
@@ -300,12 +294,12 @@
 
 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
 #. Remember to keep the translation short to fit the screen width
-#: ../app/ui/AddToPlaylist.qml:99 ../app/ui/Playlists.qml:38
+#: ../app/ui/AddToPlaylist.qml:98 ../app/ui/Playlists.qml:37
 #: ../app/ui/SongsView.qml:103
 msgid "Playlists"
 msgstr ""
 
-#: ../app/ui/AddToPlaylist.qml:109 ../app/ui/Recent.qml:37
+#: ../app/ui/AddToPlaylist.qml:108 ../app/ui/Recent.qml:36
 #: ../app/ui/SongsView.qml:91
 msgid "Recent"
 msgstr ""
@@ -314,35 +308,35 @@
 msgid "Albums"
 msgstr ""
 
-#: ../app/ui/Albums.qml:72 ../app/ui/ArtistView.qml:129
-#: ../app/ui/ArtistView.qml:142 ../app/ui/Recent.qml:82
+#: ../app/ui/Albums.qml:72 ../app/ui/ArtistView.qml:128
+#: ../app/ui/ArtistView.qml:141 ../app/ui/Recent.qml:81
 #: ../app/ui/SongsView.qml:249
 msgid "Unknown Album"
 msgstr ""
 
-#: ../app/ui/Albums.qml:73 ../app/ui/ArtistView.qml:85
-#: ../app/ui/ArtistView.qml:141 ../app/ui/Artists.qml:80
-#: ../app/ui/Recent.qml:83 ../app/ui/SongsView.qml:270
+#: ../app/ui/Albums.qml:73 ../app/ui/ArtistView.qml:84
+#: ../app/ui/ArtistView.qml:140 ../app/ui/Artists.qml:79
+#: ../app/ui/Recent.qml:82 ../app/ui/SongsView.qml:270
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../app/ui/Albums.qml:83 ../app/ui/ArtistView.qml:140
-#: ../app/ui/Recent.qml:98
+#: ../app/ui/Albums.qml:83 ../app/ui/ArtistView.qml:139
+#: ../app/ui/Recent.qml:97
 msgid "Album"
 msgstr ""
 
-#: ../app/ui/ArtistView.qml:104
+#: ../app/ui/ArtistView.qml:103
 #, qt-format
 msgid "%1 album"
 msgid_plural "%1 albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/ui/Artists.qml:38
+#: ../app/ui/Artists.qml:37
 msgid "Artists"
 msgstr ""
 
-#: ../app/ui/Artists.qml:108
+#: ../app/ui/Artists.qml:107
 msgid "Artist"
 msgstr ""
 
@@ -361,17 +355,27 @@
 msgid "Genre"
 msgstr ""
 
-#: ../app/ui/LibraryEmptyState.qml:106
+#: ../app/ui/LibraryEmptyState.qml:112
 msgid "No music found"
 msgstr ""
 
+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
+#: ../app/ui/NowPlaying.qml:40
+msgid "Full view"
+msgstr ""
+
+#. TRANSLATORS: this appears in the header with limited space (around 20 characters)
+#: ../app/ui/NowPlaying.qml:42
+msgid "Queue"
+msgstr ""
+
 #. TRANSLATORS: this action appears in the overflow drawer with limited space (around 18 characters)
-#: ../app/ui/NowPlaying.qml:108
+#: ../app/ui/NowPlaying.qml:123
 msgid "Clear queue"
 msgstr ""
 
-#: ../app/ui/Playlists.qml:99 ../app/ui/Playlists.qml:100
-#: ../app/ui/Recent.qml:83 ../app/ui/Recent.qml:98 ../app/ui/SongsView.qml:67
+#: ../app/ui/Playlists.qml:98 ../app/ui/Playlists.qml:99
+#: ../app/ui/Recent.qml:82 ../app/ui/Recent.qml:97 ../app/ui/SongsView.qml:67
 #: ../app/ui/SongsView.qml:82 ../app/ui/SongsView.qml:114
 #: ../app/ui/SongsView.qml:154 ../app/ui/SongsView.qml:188
 #: ../app/ui/SongsView.qml:203 ../app/ui/SongsView.qml:222

=== modified file 'tests/autopilot/music_app/__init__.py'
--- tests/autopilot/music_app/__init__.py	2015-11-02 05:04:08 +0000
+++ tests/autopilot/music_app/__init__.py	2015-11-16 02:01:16 +0000
@@ -27,7 +27,7 @@
     """Wrapper which ensures the now playing is full before clicking"""
     def func_wrapper(self, *args, **kwargs):
         if self.isListView:
-            self.click_toggle_view()
+            self.click_full_view()
 
         return func(self, *args, **kwargs)
 
@@ -38,7 +38,7 @@
     """Wrapper which ensures the now playing is list before clicking"""
     def func_wrapper(self, *args, **kwargs):
         if not self.isListView:
-            self.click_toggle_view()
+            self.click_queue_view()
 
         return func(self, *args, **kwargs)
 
@@ -289,8 +289,11 @@
     def click_shuffle_button(self):
         return self.wait_select_single("*", objectName="shuffleShape")
 
-    def click_toggle_view(self):
-        self.main_view.get_header().click_action_button("toggleView")
+    def click_full_view(self):
+        self.main_view.get_header().switch_to_section_by_index(0)
+
+    def click_queue_view(self):
+        self.main_view.get_header().switch_to_section_by_index(1)
 
     @ensure_now_playing_list
     def get_track(self, i):