Merge lp:~vthompson/music-app/sketching-the-future-001 into lp:music-app/remix

[Victor Thompson]

* Show full cover art in Now Playing
* Allow swipe left or right to navigate queue in Now Playing

Inputs from the community [1] along with the fact that the cover art provided by the thumbnailer service is mostly adequate enough to display full screen cover art, has given the team a desire to change how the Now Playing view displays cover art. This change displays full screen cover art.

[1] https://plus.google.com/116597364982833470829/posts/hkYDdVVk5QX

[Victor Thompson (vthompson)]

#blocked Design input

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

PASSED: Continuous integration, rev:763
http://91.189.93.70:8080/job/music-app-ci/1176/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/482
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/482/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/28

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:763
http://91.189.93.70:8080/job/music-app-ci/1176/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/482
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/482/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/28

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/sketching-the-future-001]

764. By Victor Thompson on 2015-01-14

merge of trunk

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

PASSED: Continuous integration, rev:764
http://91.189.93.70:8080/job/music-app-ci/1212/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/667
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/667/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/64

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

#unblocked design has approved this change

[Andrew Hayzen (ahayzen)]

Looks good so far, visually the only issue I have is that it is difficult to tell where you have to click on the progress bar, as it is black on black.

4 inline diff comments/questions.

review: Needs Fixing

[lp:~vthompson/music-app/sketching-the-future-001]

765. By Victor Thompson on 2015-01-18

update per comments.

[Victor Thompson (vthompson)]

I've pushed changes with resolutions to the inline comments.

[Andrew Hayzen (ahayzen)]

Awesome really good to see the designs land :)

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2015-01-14 05:07:22 +0000
+++ MusicNowPlaying.qml	2015-01-18 00:06:21 +0000
@@ -191,32 +191,49 @@
 
     Item {
         id: fullview
-        anchors.fill: parent
+        anchors {
+            top: parent.top
+            topMargin: mainView.header.height
+        }
+        height: parent.height - mainView.header.height - units.gu(9.5)
         visible: !isListView
+        width: parent.width
 
         BlurredBackground {
             id: blurredBackground
-            anchors.top: parent.top
-            anchors.topMargin: mainView.header.height
-            height: units.gu(27)
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: parent.top
+            }
             art: albumImage.firstSource
-
-            CoverGrid {
-                id: albumImage
+            height: parent.height - units.gu(7)
+  
+            Item {
+                id: albumImageContainer
                 anchors {
-                    centerIn: parent
-                }
-                covers: [{art: player.currentMetaArt, author: player.currentMetaArtist, album: player.currentMetaAlbum}]
-                size: units.gu(18)
-            }
-        }
-
-        /* Full toolbar */
-        Item {
-            id: musicToolbarFullContainer
-            anchors.top: blurredBackground.bottom
-            anchors.topMargin: nowPlayingWideAspectTitle.lineCount === 1 ? units.gu(4) : units.gu(2)
-            width: blurredBackground.width
+                    horizontalCenter: parent.horizontalCenter
+                    top: parent.top
+                }
+                height: parent.height
+                width: parent.width
+
+                CoverGrid {
+                    id: albumImage
+                    anchors.centerIn: parent
+                    covers: [{art: player.currentMetaArt, author: player.currentMetaArtist, album: player.currentMetaAlbum}]
+                    size: parent.width > parent.height ? parent.height : parent.width
+                }
+            }
+
+            Rectangle {
+                id: nowPlayingWideAspectLabelsBackground
+                anchors.bottom: parent.bottom
+                color: styleMusic.common.black
+                height: nowPlayingWideAspectTitle.lineCount === 1 ? units.gu(10) : units.gu(13)
+                opacity: 0.8
+                width: parent.width
+            }
 
             /* Column for labels in wideAspect */
             Column {
@@ -227,6 +244,8 @@
                     leftMargin: units.gu(2)
                     right: parent.right
                     rightMargin: units.gu(2)
+                    top: nowPlayingWideAspectLabelsBackground.top
+                    topMargin: nowPlayingWideAspectTitle.lineCount === 1 ? units.gu(2) : units.gu(1.5)
                 }
 
                 /* Title of track */
@@ -263,224 +282,137 @@
                 }
             }
 
-            /* Progress bar component */
+            /* Detect cover art swipe */
             MouseArea {
-                id: musicToolbarFullProgressContainer
-                anchors.left: parent.left
-                anchors.leftMargin: units.gu(3)
+                anchors.fill: parent
+                property string direction: "None"
+                property real lastX: -1
+
+                onPressed: lastX = mouse.x
+
+                onReleased: {
+                    var diff = mouse.x - lastX
+                    if (Math.abs(diff) < units.gu(4)) {
+                        return;
+                    } else if (diff < 0) {
+                        player.previousSong()
+                    } else if (diff > 0) {
+                        player.nextSong()
+                    }
+                }
+            }
+        }
+
+        /* Background for progress bar component */
+        Rectangle {
+            id: musicToolbarFullProgressBackground
+            anchors {
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+                top: blurredBackground.bottom
+            }
+            color: styleMusic.common.black
+        }
+
+        /* Progress bar component */
+        Item {
+            id: musicToolbarFullProgressContainer
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(3)
+            anchors.right: parent.right
+            anchors.rightMargin: units.gu(3)
+            anchors.top: blurredBackground.bottom
+            anchors.topMargin: units.gu(1)
+            height: units.gu(3)
+            width: parent.width
+
+            /* Position label */
+            Label {
+                id: musicToolbarFullPositionLabel
+                anchors.top: progressSliderMusic.bottom
+                anchors.topMargin: units.gu(-2)
+                anchors.left: parent.left
+                color: styleMusic.nowPlaying.labelSecondaryColor
+                fontSize: "small"
+                height: parent.height
+                horizontalAlignment: Text.AlignHCenter
+                text: durationToString(player.position)
+                verticalAlignment: Text.AlignVCenter
+                width: units.gu(3)
+            }
+
+            Slider {
+                id: progressSliderMusic
+                anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.rightMargin: units.gu(3)
-                anchors.top: nowPlayingWideAspectLabels.bottom
-                anchors.topMargin: nowPlayingWideAspectTitle.lineCount === 1 ? units.gu(3) : units.gu(1.5)
-                height: units.gu(3)
-                width: parent.width
-
-                /* Position label */
-                Label {
-                    id: musicToolbarFullPositionLabel
-                    anchors.top: progressSliderMusic.bottom
-                    anchors.topMargin: units.gu(-2)
-                    anchors.left: parent.left
-                    color: styleMusic.nowPlaying.labelSecondaryColor
-                    fontSize: "small"
-                    height: parent.height
-                    horizontalAlignment: Text.AlignHCenter
-                    text: durationToString(player.position)
-                    verticalAlignment: Text.AlignVCenter
-                    width: units.gu(3)
-                }
-
-                Slider {
-                    id: progressSliderMusic
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    maximumValue: player.duration  // load value at startup
-                    objectName: "progressSliderShape"
-                    style: UbuntuBlueSliderStyle {}
-                    value: player.position  // load value at startup
-
-                    function formatValue(v) {
-                        if (seeking) {  // update position label while dragging
-                            musicToolbarFullPositionLabel.text = durationToString(v)
-                        }
-
-                        return durationToString(v)
-                    }
-
-                    property bool seeking: false
-                    property bool seeked: false
-
-                    onSeekingChanged: {
-                        if (seeking === false) {
+                maximumValue: player.duration  // load value at startup
+                objectName: "progressSliderShape"
+                style: UbuntuBlueSliderStyle {}
+                value: player.position  // load value at startup
+
+                function formatValue(v) {
+                    if (seeking) {  // update position label while dragging
+                        musicToolbarFullPositionLabel.text = durationToString(v)
+                    }
+
+                    return durationToString(v)
+                }
+
+                property bool seeking: false
+                property bool seeked: false
+
+                onSeekingChanged: {
+                    if (seeking === false) {
+                        musicToolbarFullPositionLabel.text = durationToString(player.position)
+                    }
+                }
+
+                onPressedChanged: {
+                    seeking = pressed
+
+                    if (!pressed) {
+                        seeked = true
+                        player.seek(value)
+
+                        musicToolbarFullPositionLabel.text = durationToString(value)
+                    }
+                }
+
+                Connections {
+                    target: player
+                    onPositionChanged: {
+                        // seeked is a workaround for bug 1310706 as the first position after a seek is sometimes invalid (0)
+                        if (progressSliderMusic.seeking === false && !progressSliderMusic.seeked) {
                             musicToolbarFullPositionLabel.text = durationToString(player.position)
-                        }
-                    }
-
-                    onPressedChanged: {
-                        seeking = pressed
-
-                        if (!pressed) {
-                            seeked = true
-                            player.seek(value)
-
-                            musicToolbarFullPositionLabel.text = durationToString(value)
-                       }
-                    }
-
-                    Connections {
-                        target: player
-                        onPositionChanged: {
-                            // seeked is a workaround for bug 1310706 as the first position after a seek is sometimes invalid (0)
-                            if (progressSliderMusic.seeking === false && !progressSliderMusic.seeked) {
-                                musicToolbarFullPositionLabel.text = durationToString(player.position)
-                                musicToolbarFullDurationLabel.text = durationToString(player.duration)
-
-                                progressSliderMusic.value = player.position
-                                progressSliderMusic.maximumValue = player.duration
-                            }
-
-                            progressSliderMusic.seeked = false;
-                        }
-                        onStopped: {
-                            musicToolbarFullPositionLabel.text = durationToString(0);
-                            musicToolbarFullDurationLabel.text = durationToString(0);
-                        }
-                    }
-                }
-
-                /* Duration label */
-                Label {
-                    id: musicToolbarFullDurationLabel
-                    anchors.top: progressSliderMusic.bottom
-                    anchors.topMargin: units.gu(-2)
-                    anchors.right: parent.right
-                    color: styleMusic.nowPlaying.labelSecondaryColor
-                    fontSize: "small"
-                    height: parent.height
-                    horizontalAlignment: Text.AlignHCenter
-                    text: durationToString(player.duration)
-                    verticalAlignment: Text.AlignVCenter
-                    width: units.gu(3)
-                }
-            }
-
-            /* Repeat button */
-            MouseArea {
-                id: nowPlayingRepeatButton
-                anchors.right: nowPlayingPreviousButton.left
-                anchors.rightMargin: units.gu(1)
-                anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
-                height: units.gu(6)
-                opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
-                width: height
-                onClicked: player.repeat = !player.repeat
-
-                Icon {
-                    id: repeatIcon
-                    height: units.gu(3)
-                    width: height
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "white"
-                    name: "media-playlist-repeat"
-                    objectName: "repeatShape"
-                    opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
-                }
-            }
-
-            /* Previous button */
-            MouseArea {
-                id: nowPlayingPreviousButton
-                anchors.right: nowPlayingPlayButton.left
-                anchors.rightMargin: units.gu(1)
-                anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
-                height: units.gu(6)
-                opacity: trackQueue.model.count === 0  ? .4 : 1
-                width: height
-                onClicked: player.previousSong()
-
-                Icon {
-                    id: nowPlayingPreviousIndicator
-                    height: units.gu(3)
-                    width: height
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "white"
-                    name: "media-skip-backward"
-                    objectName: "previousShape"
-                    opacity: 1
-                }
-            }
-
-            /* Play/Pause button */
-            MouseArea {
-                id: nowPlayingPlayButton
-                anchors.horizontalCenter: parent.horizontalCenter
-                anchors.top: musicToolbarFullProgressContainer.bottom
-                anchors.topMargin: units.gu(2)
-                height: units.gu(12)
-                width: height
-                onClicked: player.toggle()
-
-                Icon {
-                    id: nowPlayingPlayIndicator
-                    height: units.gu(6)
-                    width: height
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    opacity: emptyPage.noMusic ? .4 : 1
-                    color: "white"
-                    name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start"
-                    objectName: "playShape"
-                }
-            }
-
-            /* Next button */
-            MouseArea {
-                id: nowPlayingNextButton
-                anchors.left: nowPlayingPlayButton.right
-                anchors.leftMargin: units.gu(1)
-                anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
-                height: units.gu(6)
-                opacity: trackQueue.model.count === 0 ? .4 : 1
-                width: height
-                onClicked: player.nextSong()
-
-                Icon {
-                    id: nowPlayingNextIndicator
-                    height: units.gu(3)
-                    width: height
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "white"
-                    name: "media-skip-forward"
-                    objectName: "forwardShape"
-                    opacity: 1
-                }
-            }
-
-            /* Shuffle button */
-            MouseArea {
-                id: nowPlayingShuffleButton
-                anchors.left: nowPlayingNextButton.right
-                anchors.leftMargin: units.gu(1)
-                anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
-                height: units.gu(6)
-                opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
-                width: height
-                onClicked: player.shuffle = !player.shuffle
-
-                Icon {
-                    id: shuffleIcon
-                    height: units.gu(3)
-                    width: height
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    color: "white"
-                    name: "media-playlist-shuffle"
-                    objectName: "shuffleShape"
-                    opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
-                }
+                            musicToolbarFullDurationLabel.text = durationToString(player.duration)
+
+                            progressSliderMusic.value = player.position
+                            progressSliderMusic.maximumValue = player.duration
+                        }
+
+                        progressSliderMusic.seeked = false;
+                    }
+                    onStopped: {
+                        musicToolbarFullPositionLabel.text = durationToString(0);
+                        musicToolbarFullDurationLabel.text = durationToString(0);
+                    }
+                }
+            }
+
+            /* Duration label */
+            Label {
+                id: musicToolbarFullDurationLabel
+                anchors.top: progressSliderMusic.bottom
+                anchors.topMargin: units.gu(-2)
+                anchors.right: parent.right
+                color: styleMusic.nowPlaying.labelSecondaryColor
+                fontSize: "small"
+                height: parent.height
+                horizontalAlignment: Text.AlignHCenter
+                text: durationToString(player.duration)
+                verticalAlignment: Text.AlignVCenter
+                width: units.gu(3)
             }
         }
     }
@@ -569,7 +501,7 @@
         sourceComponent: ListView {
             id: queueList
             anchors {
-                bottomMargin: units.gu(2)
+                bottomMargin: musicToolbarFullContainer.height + units.gu(2)
                 fill: parent
                 topMargin: units.gu(2)
             }
@@ -628,7 +560,7 @@
                 id: queueDelegate
                 ListItemWithActions {
                     id: queueListItem
-                    color: player.currentIndex === index ? "#2c2c34" : mainView.backgroundColor
+                    color: player.currentIndex === index ? "#2c2c34" : styleMusic.mainView.backgroundColor
                     height: queueList.normalHeight
                     objectName: "nowPlayingListItem" + index
                     state: ""
@@ -718,4 +650,164 @@
         }
         visible: isListView
     }
+
+    /* Full toolbar */
+    Rectangle {
+        id: musicToolbarFullContainer
+        anchors.bottom: parent.bottom
+        color: styleMusic.common.black
+        height: units.gu(10)
+        width: parent.width
+
+        /* Repeat button */
+        MouseArea {
+            id: nowPlayingRepeatButton
+            anchors.right: nowPlayingPreviousButton.left
+            anchors.rightMargin: units.gu(1)
+            anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
+            height: units.gu(6)
+            opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
+            width: height
+            onClicked: player.repeat = !player.repeat
+
+            Icon {
+                id: repeatIcon
+                height: units.gu(3)
+                width: height
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                color: "white"
+                name: "media-playlist-repeat"
+                objectName: "repeatShape"
+                opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
+            }
+        }
+
+        /* Previous button */
+        MouseArea {
+            id: nowPlayingPreviousButton
+            anchors.right: nowPlayingPlayButton.left
+            anchors.rightMargin: units.gu(1)
+            anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
+            height: units.gu(6)
+            opacity: trackQueue.model.count === 0  ? .4 : 1
+            width: height
+            onClicked: player.previousSong()
+
+            Icon {
+                id: nowPlayingPreviousIndicator
+                height: units.gu(3)
+                width: height
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                color: "white"
+                name: "media-skip-backward"
+                objectName: "previousShape"
+                opacity: 1
+            }
+        }
+
+        /* Play/Pause button */
+        MouseArea {
+            id: nowPlayingPlayButton
+            anchors.centerIn: parent
+            height: units.gu(10)
+            width: height
+            onClicked: player.toggle()
+
+            Icon {
+                id: nowPlayingPlayIndicator
+                height: units.gu(6)
+                width: height
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                opacity: emptyPage.noMusic ? .4 : 1
+                color: "white"
+                name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start"
+                objectName: "playShape"
+            }
+        }
+
+        /* Next button */
+        MouseArea {
+            id: nowPlayingNextButton
+            anchors.left: nowPlayingPlayButton.right
+            anchors.leftMargin: units.gu(1)
+            anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
+            height: units.gu(6)
+            opacity: trackQueue.model.count === 0 ? .4 : 1
+            width: height
+            onClicked: player.nextSong()
+
+            Icon {
+                id: nowPlayingNextIndicator
+                height: units.gu(3)
+                width: height
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                color: "white"
+                name: "media-skip-forward"
+                objectName: "forwardShape"
+                opacity: 1
+            }
+        }
+
+        /* Shuffle button */
+        MouseArea {
+            id: nowPlayingShuffleButton
+            anchors.left: nowPlayingNextButton.right
+            anchors.leftMargin: units.gu(1)
+            anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
+            height: units.gu(6)
+            opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
+            width: height
+            onClicked: player.shuffle = !player.shuffle
+
+            Icon {
+                id: shuffleIcon
+                height: units.gu(3)
+                width: height
+                anchors.verticalCenter: parent.verticalCenter
+                anchors.horizontalCenter: parent.horizontalCenter
+                color: "white"
+                name: "media-playlist-shuffle"
+                objectName: "shuffleShape"
+                opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
+            }
+        }
+
+        /* Object which provides the progress bar when in the queue */
+        Rectangle {
+            id: playerControlsProgressBar
+            anchors {
+                bottom: parent.bottom
+                left: parent.left
+                right: parent.right
+            }
+            color: styleMusic.common.black
+            height: units.gu(0.25)
+            visible: isListView
+
+            Rectangle {
+                id: playerControlsProgressBarHint
+                anchors {
+                    left: parent.left
+                    bottom: parent.bottom
+                }
+                color: UbuntuColors.blue
+                height: parent.height
+                width: 0
+
+                Connections {
+                    target: player
+                    onPositionChanged: {
+                        playerControlsProgressBarHint.width = (player.position / player.duration) * playerControlsProgressBar.width
+                    }
+                    onStopped: {
+                        playerControlsProgressBarHint.width = 0;
+                    }
+                }
+            }
+        }
+    }
 }

=== modified file 'Style.qml'
--- Style.qml	2015-01-16 22:51:25 +0000
+++ Style.qml	2015-01-18 00:06:21 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015
  *      Andrew Hayzen <[e-mail]>
  *      Daniel Holm <[e-mail]>
  *      Victor Thompson <[e-mail]>
@@ -62,9 +62,9 @@
     }
 
     property QtObject mainView: QtObject{
-        property color backgroundColor: "#A55263";
-        property color footerColor: "#D75669";
-        property color headerColor: "#57365E";
+        property color backgroundColor: "#1e1e23"
+        property color footerColor: backgroundColor
+        property color headerColor: backgroundColor
     }
 
     property QtObject nowPlaying: QtObject {

=== modified file 'common/ListItemWithActions.qml'
--- common/ListItemWithActions.qml	2015-01-09 18:28:14 +0000
+++ common/ListItemWithActions.qml	2015-01-18 00:06:21 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Canonical, Ltd.
+ * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
     property Action activeAction: null
     property var activeItem: null
     property bool triggerActionOnMouseRelease: false
-    property color color: "#1e1e23"
+    property color color: styleMusic.mainView.backgroundColor
     property color selectedColor: "#3d3d45"  // "#E6E6E6"  // CUSTOM
     property bool selected: false
     property bool selectionMode: false

=== modified file 'music-app.qml'
--- music-app.qml	2015-01-16 22:51:25 +0000
+++ music-app.qml	2015-01-18 00:06:21 +0000
@@ -38,8 +38,8 @@
     id: mainView
     useDeprecatedToolbar: false
 
-    backgroundColor: "#1e1e23"
-    headerColor: "#1e1e23"
+    backgroundColor: styleMusic.mainView.backgroundColor
+    headerColor: styleMusic.mainView.headerColor
 
     // Startup settings
     Settings {
@@ -886,7 +886,8 @@
 
     MusicToolbar {
         id: musicToolbar
-        visible: mainPageStack.currentPage.title !== i18n.tr("Now playing")
+        visible: mainPageStack.currentPage.title !== i18n.tr("Now playing") &&
+                 mainPageStack.currentPage.title !== i18n.tr("Queue")
         objectName: "musicToolbarObject"
         z: 200  // put on top of everything else
     }