Merge lp://qastaging/~ahayzen/music-app/refactor-pull-now-playing-sidebar into lp://qastaging/music-app

Proposed by Andrew Hayzen
Status: Rejected
Rejected by: Andrew Hayzen
Proposed branch: lp://qastaging/~ahayzen/music-app/refactor-pull-now-playing-sidebar
Merge into: lp://qastaging/music-app
Diff against target: 385 lines (+152/-11)
15 files modified
app/components/MusicPage.qml (+45/-4)
app/components/NowPlayingSidebar.qml (+60/-0)
app/components/NowPlayingToolbar.qml (+2/-0)
app/components/Queue.qml (+4/-2)
app/music-app.qml (+29/-3)
app/ui/AddToPlaylist.qml (+1/-0)
app/ui/Albums.qml (+1/-0)
app/ui/ArtistView.qml (+1/-0)
app/ui/Artists.qml (+1/-0)
app/ui/Genres.qml (+1/-0)
app/ui/Playlists.qml (+1/-0)
app/ui/Recent.qml (+1/-0)
app/ui/Songs.qml (+1/-0)
app/ui/SongsView.qml (+3/-2)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp://qastaging/~ahayzen/music-app/refactor-pull-now-playing-sidebar
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Needs Information
Review via email: mp+253839@code.qastaging.launchpad.net

Commit message

* Make NowPlaying into a conditional sidebar

Description of the change

* Make NowPlaying into a conditional sidebar

Pull of lp:~music-app-dev/music-app/refactor-now-playing-as-sidebar into lp:music-app/refactor with conflicts resolved :)

To post a comment you must log in.
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Note this pulls in lp:~ahayzen/music-app/async-loader-pages as well.

848. By Andrew Hayzen

* Reverse cherry pick lp:~ahayzen/music-app/async-loader-pages out of this branch

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

OK reverse cherry picked async-loader-pages out, but this [0] patch still remains not sure it is needed in this specific branch, but it does fix columnflow issues.

0 - http://bazaar.launchpad.net/~music-app-dev/music-app/refactor-now-playing-as-sidebar/revision/842

849. By Andrew Hayzen

* Fix bad merge conflict

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
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

Currently there are issues with app rotation in vivid. These are fixed with the full implementation of shell rotation (which has not yet landed). This MP is more or less blocked from using autorotation until that lands in vivid and vivid becomes the stable channel.

850. By Andrew Hayzen

* Merge of lp:music-app/refactor

851. By Andrew Hayzen

* Fix uses of header instead of blurredHeader

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
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Is this still valid / wanted?

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

This pulls in the final portion of the code that was prototyped for the "converged" music app that was demoed at MWC. Currently it is blocked by the vivid rotation bug [1]. We discussed possibly disabling auto-rotation and landing this, but we assumed the auto-rotation bug would be fixed soon. If we want to have the "converged" app available, we can disable auto-rotation and land this.

1 - lp:1448017

852. By Andrew Hayzen

* Merge of lp:music-app/refactor

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

PASSED: Continuous integration, rev:852
http://91.189.93.70:8080/job/music-app-ci/1330/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/182

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Inline note to self :-)

review: Needs Information
853. By Andrew Hayzen

* Add changelog

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

PASSED: Continuous integration, rev:853
http://91.189.93.70:8080/job/music-app-ci/1342/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/194

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

review: Approve (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

I've been playing with this branch a bit on my desktop and a Nexus 7. One thing I think we should do is to optimize the side panel Now Playing page a bit more.

1. The text for the current song title should be smaller
2. The padding between components could be made a lot smaller
3. Maybe we put the progress current time and duration on the same Row as the ProgressBar?
4. Maybe the buttons could be a bit smaller?
5. Perhaps we can make the side panel smaller such that the blurred header is "square" and the cover art utilizes this space better

If we try to minimize items 2, 3, and 4 then perhaps the cover art could be made to fit the blurred header a bit more better, ie be square.

This doesn't need to be done under this MP, but I think it'd be great if this single switch to the converged view did so cleanly.

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

Or perhaps we could make the NowPlayingSidebar component 47 GU high [1]. The down side is that it's not as clear that the queue is under the Now Playing component. Maybe we need to reconsider having 2 headers? We should check with the SDK and see if that's the intended path.

1 - http://i.imgur.com/c3lFxpL.jpg

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

Thinking about it more, I think just making the NowPlayingSidebar 47 GU tall is the best course of action for now. If we want to optimize the spacing and whatnot later we can do so at that time. I don't think the view for the converged device will be as small as the Nexus 7.

854. By Andrew Hayzen

Merge of lp:~vthompson/music-app/fix-orientation

855. By Andrew Hayzen

* Merge of trunk

856. By Andrew Hayzen

* Remove unused orientation sensor

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

PASSED: Continuous integration, rev:856
http://91.189.93.70:8080/job/music-app-ci/1364/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/216

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

review: Approve (continuous-integration)

Unmerged revisions

856. By Andrew Hayzen

* Remove unused orientation sensor

855. By Andrew Hayzen

* Merge of trunk

854. By Andrew Hayzen

Merge of lp:~vthompson/music-app/fix-orientation

853. By Andrew Hayzen

* Add changelog

852. By Andrew Hayzen

* Merge of lp:music-app/refactor

851. By Andrew Hayzen

* Fix uses of header instead of blurredHeader

850. By Andrew Hayzen

* Merge of lp:music-app/refactor

849. By Andrew Hayzen

* Fix bad merge conflict

848. By Andrew Hayzen

* Reverse cherry pick lp:~ahayzen/music-app/async-loader-pages out of this branch

847. By Andrew Hayzen

* Make NowPlaying into a conditional sidebar

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches