Merge lp:~vthompson/music-app/remix-add-clear-queue into lp:music-app/remix

Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 666
Merged at revision: 666
Proposed branch: lp:~vthompson/music-app/remix-add-clear-queue
Merge into: lp:music-app/remix
Diff against target: 22 lines (+10/-1)
1 file modified
MusicNowPlaying.qml (+10/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-add-clear-queue
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+238152@code.launchpad.net

This proposal supersedes a proposal from 2014-10-13.

Commit message

Add clear queue action

Description of the change

A discussion with design came up with a way of fixing the currently confusing pattern of navigating back to other views in the app from the Queue. The conclusion was to have the list icon toggle the view to and from the Queue, and keep the chevron as a "back to library" action. Also, a clear queue action is to be added to the Queue view--as that is what the x icon was supposed to do.

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

Awesome :) LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicNowPlaying.qml'
2--- MusicNowPlaying.qml 2014-10-11 17:56:21 +0000
3+++ MusicNowPlaying.qml 2014-10-13 12:56:32 +0000
4@@ -56,8 +56,17 @@
5 head {
6 actions: [
7 Action {
8+ objectName: "clearQueue"
9+ iconName: "delete"
10+ visible: isListView
11+ onTriggered: {
12+ head.backAction.trigger()
13+ trackQueue.model.clear()
14+ }
15+ },
16+ Action {
17 objectName: "toggleView"
18- iconName: isListView ? "clear" : "media-playlist"
19+ iconName: "media-playlist"
20 onTriggered: {
21 isListView = !isListView
22 }

Subscribers

People subscribed via source and target branches