Ubuntu Music App

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

  1. sketching-the-future-001
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 765
Merged at revision: 789
Proposed branch: lp:~vthompson/music-app/sketching-the-future-001
Merge into: lp:music-app/remix
Diff against target: 687 lines (+339/-246)
4 files modified
MusicNowPlaying.qml (+329/-237)
Style.qml (+4/-4)
common/ListItemWithActions.qml (+2/-2)
music-app.qml (+4/-3)
To merge this branch: bzr merge lp:~vthompson/music-app/sketching-the-future-001
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+245062@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Victor Thompson (vthompson) wrote :

#blocked Design input

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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 updated
764. By Victor Thompson

merge of trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Victor Thompson (vthompson) wrote :

#unblocked design has approved this change

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

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 updated
765. By Victor Thompson

update per comments.

Revision history for this message
Victor Thompson (vthompson) wrote :

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

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Awesome really good to see the designs land :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
191191
192 Item {192 Item {
193 id: fullview193 id: fullview
194 anchors.fill: parent194 anchors {
195 top: parent.top
196 topMargin: mainView.header.height
197 }
198 height: parent.height - mainView.header.height - units.gu(9.5)
195 visible: !isListView199 visible: !isListView
200 width: parent.width
196201
197 BlurredBackground {202 BlurredBackground {
198 id: blurredBackground203 id: blurredBackground
199 anchors.top: parent.top204 anchors {
200 anchors.topMargin: mainView.header.height205 left: parent.left
201 height: units.gu(27)206 right: parent.right
207 top: parent.top
208 }
202 art: albumImage.firstSource209 art: albumImage.firstSource
203210 height: parent.height - units.gu(7)
204 CoverGrid {211
205 id: albumImage212 Item {
213 id: albumImageContainer
206 anchors {214 anchors {
207 centerIn: parent215 horizontalCenter: parent.horizontalCenter
208 }216 top: parent.top
209 covers: [{art: player.currentMetaArt, author: player.currentMetaArtist, album: player.currentMetaAlbum}]217 }
210 size: units.gu(18)218 height: parent.height
211 }219 width: parent.width
212 }220
213221 CoverGrid {
214 /* Full toolbar */222 id: albumImage
215 Item {223 anchors.centerIn: parent
216 id: musicToolbarFullContainer224 covers: [{art: player.currentMetaArt, author: player.currentMetaArtist, album: player.currentMetaAlbum}]
217 anchors.top: blurredBackground.bottom225 size: parent.width > parent.height ? parent.height : parent.width
218 anchors.topMargin: nowPlayingWideAspectTitle.lineCount === 1 ? units.gu(4) : units.gu(2)226 }
219 width: blurredBackground.width227 }
228
229 Rectangle {
230 id: nowPlayingWideAspectLabelsBackground
231 anchors.bottom: parent.bottom
232 color: styleMusic.common.black
233 height: nowPlayingWideAspectTitle.lineCount === 1 ? units.gu(10) : units.gu(13)
234 opacity: 0.8
235 width: parent.width
236 }
220237
221 /* Column for labels in wideAspect */238 /* Column for labels in wideAspect */
222 Column {239 Column {
@@ -227,6 +244,8 @@
227 leftMargin: units.gu(2)244 leftMargin: units.gu(2)
228 right: parent.right245 right: parent.right
229 rightMargin: units.gu(2)246 rightMargin: units.gu(2)
247 top: nowPlayingWideAspectLabelsBackground.top
248 topMargin: nowPlayingWideAspectTitle.lineCount === 1 ? units.gu(2) : units.gu(1.5)
230 }249 }
231250
232 /* Title of track */251 /* Title of track */
@@ -263,224 +282,137 @@
263 }282 }
264 }283 }
265284
266 /* Progress bar component */285 /* Detect cover art swipe */
267 MouseArea {286 MouseArea {
268 id: musicToolbarFullProgressContainer287 anchors.fill: parent
269 anchors.left: parent.left288 property string direction: "None"
270 anchors.leftMargin: units.gu(3)289 property real lastX: -1
290
291 onPressed: lastX = mouse.x
292
293 onReleased: {
294 var diff = mouse.x - lastX
295 if (Math.abs(diff) < units.gu(4)) {
296 return;
297 } else if (diff < 0) {
298 player.previousSong()
299 } else if (diff > 0) {
300 player.nextSong()
301 }
302 }
303 }
304 }
305
306 /* Background for progress bar component */
307 Rectangle {
308 id: musicToolbarFullProgressBackground
309 anchors {
310 bottom: parent.bottom
311 left: parent.left
312 right: parent.right
313 top: blurredBackground.bottom
314 }
315 color: styleMusic.common.black
316 }
317
318 /* Progress bar component */
319 Item {
320 id: musicToolbarFullProgressContainer
321 anchors.left: parent.left
322 anchors.leftMargin: units.gu(3)
323 anchors.right: parent.right
324 anchors.rightMargin: units.gu(3)
325 anchors.top: blurredBackground.bottom
326 anchors.topMargin: units.gu(1)
327 height: units.gu(3)
328 width: parent.width
329
330 /* Position label */
331 Label {
332 id: musicToolbarFullPositionLabel
333 anchors.top: progressSliderMusic.bottom
334 anchors.topMargin: units.gu(-2)
335 anchors.left: parent.left
336 color: styleMusic.nowPlaying.labelSecondaryColor
337 fontSize: "small"
338 height: parent.height
339 horizontalAlignment: Text.AlignHCenter
340 text: durationToString(player.position)
341 verticalAlignment: Text.AlignVCenter
342 width: units.gu(3)
343 }
344
345 Slider {
346 id: progressSliderMusic
347 anchors.left: parent.left
271 anchors.right: parent.right348 anchors.right: parent.right
272 anchors.rightMargin: units.gu(3)349 maximumValue: player.duration // load value at startup
273 anchors.top: nowPlayingWideAspectLabels.bottom350 objectName: "progressSliderShape"
274 anchors.topMargin: nowPlayingWideAspectTitle.lineCount === 1 ? units.gu(3) : units.gu(1.5)351 style: UbuntuBlueSliderStyle {}
275 height: units.gu(3)352 value: player.position // load value at startup
276 width: parent.width353
277354 function formatValue(v) {
278 /* Position label */355 if (seeking) { // update position label while dragging
279 Label {356 musicToolbarFullPositionLabel.text = durationToString(v)
280 id: musicToolbarFullPositionLabel357 }
281 anchors.top: progressSliderMusic.bottom358
282 anchors.topMargin: units.gu(-2)359 return durationToString(v)
283 anchors.left: parent.left360 }
284 color: styleMusic.nowPlaying.labelSecondaryColor361
285 fontSize: "small"362 property bool seeking: false
286 height: parent.height363 property bool seeked: false
287 horizontalAlignment: Text.AlignHCenter364
288 text: durationToString(player.position)365 onSeekingChanged: {
289 verticalAlignment: Text.AlignVCenter366 if (seeking === false) {
290 width: units.gu(3)367 musicToolbarFullPositionLabel.text = durationToString(player.position)
291 }368 }
292369 }
293 Slider {370
294 id: progressSliderMusic371 onPressedChanged: {
295 anchors.left: parent.left372 seeking = pressed
296 anchors.right: parent.right373
297 maximumValue: player.duration // load value at startup374 if (!pressed) {
298 objectName: "progressSliderShape"375 seeked = true
299 style: UbuntuBlueSliderStyle {}376 player.seek(value)
300 value: player.position // load value at startup377
301378 musicToolbarFullPositionLabel.text = durationToString(value)
302 function formatValue(v) {379 }
303 if (seeking) { // update position label while dragging380 }
304 musicToolbarFullPositionLabel.text = durationToString(v)381
305 }382 Connections {
306383 target: player
307 return durationToString(v)384 onPositionChanged: {
308 }385 // seeked is a workaround for bug 1310706 as the first position after a seek is sometimes invalid (0)
309386 if (progressSliderMusic.seeking === false && !progressSliderMusic.seeked) {
310 property bool seeking: false
311 property bool seeked: false
312
313 onSeekingChanged: {
314 if (seeking === false) {
315 musicToolbarFullPositionLabel.text = durationToString(player.position)387 musicToolbarFullPositionLabel.text = durationToString(player.position)
316 }388 musicToolbarFullDurationLabel.text = durationToString(player.duration)
317 }389
318390 progressSliderMusic.value = player.position
319 onPressedChanged: {391 progressSliderMusic.maximumValue = player.duration
320 seeking = pressed392 }
321393
322 if (!pressed) {394 progressSliderMusic.seeked = false;
323 seeked = true395 }
324 player.seek(value)396 onStopped: {
325397 musicToolbarFullPositionLabel.text = durationToString(0);
326 musicToolbarFullPositionLabel.text = durationToString(value)398 musicToolbarFullDurationLabel.text = durationToString(0);
327 }399 }
328 }400 }
329401 }
330 Connections {402
331 target: player403 /* Duration label */
332 onPositionChanged: {404 Label {
333 // seeked is a workaround for bug 1310706 as the first position after a seek is sometimes invalid (0)405 id: musicToolbarFullDurationLabel
334 if (progressSliderMusic.seeking === false && !progressSliderMusic.seeked) {406 anchors.top: progressSliderMusic.bottom
335 musicToolbarFullPositionLabel.text = durationToString(player.position)407 anchors.topMargin: units.gu(-2)
336 musicToolbarFullDurationLabel.text = durationToString(player.duration)408 anchors.right: parent.right
337409 color: styleMusic.nowPlaying.labelSecondaryColor
338 progressSliderMusic.value = player.position410 fontSize: "small"
339 progressSliderMusic.maximumValue = player.duration411 height: parent.height
340 }412 horizontalAlignment: Text.AlignHCenter
341413 text: durationToString(player.duration)
342 progressSliderMusic.seeked = false;414 verticalAlignment: Text.AlignVCenter
343 }415 width: units.gu(3)
344 onStopped: {
345 musicToolbarFullPositionLabel.text = durationToString(0);
346 musicToolbarFullDurationLabel.text = durationToString(0);
347 }
348 }
349 }
350
351 /* Duration label */
352 Label {
353 id: musicToolbarFullDurationLabel
354 anchors.top: progressSliderMusic.bottom
355 anchors.topMargin: units.gu(-2)
356 anchors.right: parent.right
357 color: styleMusic.nowPlaying.labelSecondaryColor
358 fontSize: "small"
359 height: parent.height
360 horizontalAlignment: Text.AlignHCenter
361 text: durationToString(player.duration)
362 verticalAlignment: Text.AlignVCenter
363 width: units.gu(3)
364 }
365 }
366
367 /* Repeat button */
368 MouseArea {
369 id: nowPlayingRepeatButton
370 anchors.right: nowPlayingPreviousButton.left
371 anchors.rightMargin: units.gu(1)
372 anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
373 height: units.gu(6)
374 opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
375 width: height
376 onClicked: player.repeat = !player.repeat
377
378 Icon {
379 id: repeatIcon
380 height: units.gu(3)
381 width: height
382 anchors.verticalCenter: parent.verticalCenter
383 anchors.horizontalCenter: parent.horizontalCenter
384 color: "white"
385 name: "media-playlist-repeat"
386 objectName: "repeatShape"
387 opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
388 }
389 }
390
391 /* Previous button */
392 MouseArea {
393 id: nowPlayingPreviousButton
394 anchors.right: nowPlayingPlayButton.left
395 anchors.rightMargin: units.gu(1)
396 anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
397 height: units.gu(6)
398 opacity: trackQueue.model.count === 0 ? .4 : 1
399 width: height
400 onClicked: player.previousSong()
401
402 Icon {
403 id: nowPlayingPreviousIndicator
404 height: units.gu(3)
405 width: height
406 anchors.verticalCenter: parent.verticalCenter
407 anchors.horizontalCenter: parent.horizontalCenter
408 color: "white"
409 name: "media-skip-backward"
410 objectName: "previousShape"
411 opacity: 1
412 }
413 }
414
415 /* Play/Pause button */
416 MouseArea {
417 id: nowPlayingPlayButton
418 anchors.horizontalCenter: parent.horizontalCenter
419 anchors.top: musicToolbarFullProgressContainer.bottom
420 anchors.topMargin: units.gu(2)
421 height: units.gu(12)
422 width: height
423 onClicked: player.toggle()
424
425 Icon {
426 id: nowPlayingPlayIndicator
427 height: units.gu(6)
428 width: height
429 anchors.verticalCenter: parent.verticalCenter
430 anchors.horizontalCenter: parent.horizontalCenter
431 opacity: emptyPage.noMusic ? .4 : 1
432 color: "white"
433 name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start"
434 objectName: "playShape"
435 }
436 }
437
438 /* Next button */
439 MouseArea {
440 id: nowPlayingNextButton
441 anchors.left: nowPlayingPlayButton.right
442 anchors.leftMargin: units.gu(1)
443 anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
444 height: units.gu(6)
445 opacity: trackQueue.model.count === 0 ? .4 : 1
446 width: height
447 onClicked: player.nextSong()
448
449 Icon {
450 id: nowPlayingNextIndicator
451 height: units.gu(3)
452 width: height
453 anchors.verticalCenter: parent.verticalCenter
454 anchors.horizontalCenter: parent.horizontalCenter
455 color: "white"
456 name: "media-skip-forward"
457 objectName: "forwardShape"
458 opacity: 1
459 }
460 }
461
462 /* Shuffle button */
463 MouseArea {
464 id: nowPlayingShuffleButton
465 anchors.left: nowPlayingNextButton.right
466 anchors.leftMargin: units.gu(1)
467 anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
468 height: units.gu(6)
469 opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
470 width: height
471 onClicked: player.shuffle = !player.shuffle
472
473 Icon {
474 id: shuffleIcon
475 height: units.gu(3)
476 width: height
477 anchors.verticalCenter: parent.verticalCenter
478 anchors.horizontalCenter: parent.horizontalCenter
479 color: "white"
480 name: "media-playlist-shuffle"
481 objectName: "shuffleShape"
482 opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
483 }
484 }416 }
485 }417 }
486 }418 }
@@ -569,7 +501,7 @@
569 sourceComponent: ListView {501 sourceComponent: ListView {
570 id: queueList502 id: queueList
571 anchors {503 anchors {
572 bottomMargin: units.gu(2)504 bottomMargin: musicToolbarFullContainer.height + units.gu(2)
573 fill: parent505 fill: parent
574 topMargin: units.gu(2)506 topMargin: units.gu(2)
575 }507 }
@@ -628,7 +560,7 @@
628 id: queueDelegate560 id: queueDelegate
629 ListItemWithActions {561 ListItemWithActions {
630 id: queueListItem562 id: queueListItem
631 color: player.currentIndex === index ? "#2c2c34" : mainView.backgroundColor563 color: player.currentIndex === index ? "#2c2c34" : styleMusic.mainView.backgroundColor
632 height: queueList.normalHeight564 height: queueList.normalHeight
633 objectName: "nowPlayingListItem" + index565 objectName: "nowPlayingListItem" + index
634 state: ""566 state: ""
@@ -718,4 +650,164 @@
718 }650 }
719 visible: isListView651 visible: isListView
720 }652 }
653
654 /* Full toolbar */
655 Rectangle {
656 id: musicToolbarFullContainer
657 anchors.bottom: parent.bottom
658 color: styleMusic.common.black
659 height: units.gu(10)
660 width: parent.width
661
662 /* Repeat button */
663 MouseArea {
664 id: nowPlayingRepeatButton
665 anchors.right: nowPlayingPreviousButton.left
666 anchors.rightMargin: units.gu(1)
667 anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
668 height: units.gu(6)
669 opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
670 width: height
671 onClicked: player.repeat = !player.repeat
672
673 Icon {
674 id: repeatIcon
675 height: units.gu(3)
676 width: height
677 anchors.verticalCenter: parent.verticalCenter
678 anchors.horizontalCenter: parent.horizontalCenter
679 color: "white"
680 name: "media-playlist-repeat"
681 objectName: "repeatShape"
682 opacity: player.repeat && !emptyPage.noMusic ? 1 : .4
683 }
684 }
685
686 /* Previous button */
687 MouseArea {
688 id: nowPlayingPreviousButton
689 anchors.right: nowPlayingPlayButton.left
690 anchors.rightMargin: units.gu(1)
691 anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
692 height: units.gu(6)
693 opacity: trackQueue.model.count === 0 ? .4 : 1
694 width: height
695 onClicked: player.previousSong()
696
697 Icon {
698 id: nowPlayingPreviousIndicator
699 height: units.gu(3)
700 width: height
701 anchors.verticalCenter: parent.verticalCenter
702 anchors.horizontalCenter: parent.horizontalCenter
703 color: "white"
704 name: "media-skip-backward"
705 objectName: "previousShape"
706 opacity: 1
707 }
708 }
709
710 /* Play/Pause button */
711 MouseArea {
712 id: nowPlayingPlayButton
713 anchors.centerIn: parent
714 height: units.gu(10)
715 width: height
716 onClicked: player.toggle()
717
718 Icon {
719 id: nowPlayingPlayIndicator
720 height: units.gu(6)
721 width: height
722 anchors.verticalCenter: parent.verticalCenter
723 anchors.horizontalCenter: parent.horizontalCenter
724 opacity: emptyPage.noMusic ? .4 : 1
725 color: "white"
726 name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start"
727 objectName: "playShape"
728 }
729 }
730
731 /* Next button */
732 MouseArea {
733 id: nowPlayingNextButton
734 anchors.left: nowPlayingPlayButton.right
735 anchors.leftMargin: units.gu(1)
736 anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
737 height: units.gu(6)
738 opacity: trackQueue.model.count === 0 ? .4 : 1
739 width: height
740 onClicked: player.nextSong()
741
742 Icon {
743 id: nowPlayingNextIndicator
744 height: units.gu(3)
745 width: height
746 anchors.verticalCenter: parent.verticalCenter
747 anchors.horizontalCenter: parent.horizontalCenter
748 color: "white"
749 name: "media-skip-forward"
750 objectName: "forwardShape"
751 opacity: 1
752 }
753 }
754
755 /* Shuffle button */
756 MouseArea {
757 id: nowPlayingShuffleButton
758 anchors.left: nowPlayingNextButton.right
759 anchors.leftMargin: units.gu(1)
760 anchors.verticalCenter: nowPlayingPlayButton.verticalCenter
761 height: units.gu(6)
762 opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
763 width: height
764 onClicked: player.shuffle = !player.shuffle
765
766 Icon {
767 id: shuffleIcon
768 height: units.gu(3)
769 width: height
770 anchors.verticalCenter: parent.verticalCenter
771 anchors.horizontalCenter: parent.horizontalCenter
772 color: "white"
773 name: "media-playlist-shuffle"
774 objectName: "shuffleShape"
775 opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4
776 }
777 }
778
779 /* Object which provides the progress bar when in the queue */
780 Rectangle {
781 id: playerControlsProgressBar
782 anchors {
783 bottom: parent.bottom
784 left: parent.left
785 right: parent.right
786 }
787 color: styleMusic.common.black
788 height: units.gu(0.25)
789 visible: isListView
790
791 Rectangle {
792 id: playerControlsProgressBarHint
793 anchors {
794 left: parent.left
795 bottom: parent.bottom
796 }
797 color: UbuntuColors.blue
798 height: parent.height
799 width: 0
800
801 Connections {
802 target: player
803 onPositionChanged: {
804 playerControlsProgressBarHint.width = (player.position / player.duration) * playerControlsProgressBar.width
805 }
806 onStopped: {
807 playerControlsProgressBarHint.width = 0;
808 }
809 }
810 }
811 }
812 }
721}813}
722814
=== 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 @@
1/*1/*
2 * Copyright (C) 2013, 20142 * Copyright (C) 2013, 2014, 2015
3 * Andrew Hayzen <ahayzen@gmail.com>3 * Andrew Hayzen <ahayzen@gmail.com>
4 * Daniel Holm <d.holmen@gmail.com>4 * Daniel Holm <d.holmen@gmail.com>
5 * Victor Thompson <victor.thompson@gmail.com>5 * Victor Thompson <victor.thompson@gmail.com>
@@ -62,9 +62,9 @@
62 }62 }
6363
64 property QtObject mainView: QtObject{64 property QtObject mainView: QtObject{
65 property color backgroundColor: "#A55263";65 property color backgroundColor: "#1e1e23"
66 property color footerColor: "#D75669";66 property color footerColor: backgroundColor
67 property color headerColor: "#57365E";67 property color headerColor: backgroundColor
68 }68 }
6969
70 property QtObject nowPlaying: QtObject {70 property QtObject nowPlaying: QtObject {
7171
=== 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 @@
1/*1/*
2 * Copyright (C) 2012-2014 Canonical, Ltd.2 * Copyright (C) 2012-2015 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
30 property Action activeAction: null30 property Action activeAction: null
31 property var activeItem: null31 property var activeItem: null
32 property bool triggerActionOnMouseRelease: false32 property bool triggerActionOnMouseRelease: false
33 property color color: "#1e1e23"33 property color color: styleMusic.mainView.backgroundColor
34 property color selectedColor: "#3d3d45" // "#E6E6E6" // CUSTOM34 property color selectedColor: "#3d3d45" // "#E6E6E6" // CUSTOM
35 property bool selected: false35 property bool selected: false
36 property bool selectionMode: false36 property bool selectionMode: false
3737
=== 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 @@
38 id: mainView38 id: mainView
39 useDeprecatedToolbar: false39 useDeprecatedToolbar: false
4040
41 backgroundColor: "#1e1e23"41 backgroundColor: styleMusic.mainView.backgroundColor
42 headerColor: "#1e1e23"42 headerColor: styleMusic.mainView.headerColor
4343
44 // Startup settings44 // Startup settings
45 Settings {45 Settings {
@@ -886,7 +886,8 @@
886886
887 MusicToolbar {887 MusicToolbar {
888 id: musicToolbar888 id: musicToolbar
889 visible: mainPageStack.currentPage.title !== i18n.tr("Now playing")889 visible: mainPageStack.currentPage.title !== i18n.tr("Now playing") &&
890 mainPageStack.currentPage.title !== i18n.tr("Queue")
890 objectName: "musicToolbarObject"891 objectName: "musicToolbarObject"
891 z: 200 // put on top of everything else892 z: 200 // put on top of everything else
892 }893 }

Subscribers

People subscribed via source and target branches