lp:~ahayzen/music-app/convergence-tabs-with-sidebar-01

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:music-app at revision 998

Victor Thompson: Approve on 2016-04-06

Jenkins Bot: Approve (continuous-integration) on 2016-04-06

Diff: 2029 lines (+1077/-432)

26 files modified

app/components/BlurredBackground.qml (+3/-1)
app/components/Flickables/MusicGridView.qml (+0/-10)
app/components/HeadState/EmptyHeadState.qml (+56/-0)
app/components/HeadState/MultiSelectHeadState.qml (+89/-76)
app/components/HeadState/PlaylistHeadState.qml (+78/-0)
app/components/HeadState/PlaylistsHeadState.qml (+54/-20)
app/components/HeadState/QueueHeadState.qml (+89/-0)
app/components/HeadState/SearchHeadState.qml (+59/-46)
app/components/HeadState/SearchableHeadState.qml (+45/-8)
app/components/MusicPage.qml (+39/-0)
app/components/NowPlayingFullView.qml (+76/-68)
app/components/NowPlayingSidebar.qml (+134/-0)
app/components/NowPlayingToolbar.qml (+18/-14)
app/components/Queue.qml (+5/-1)
app/music-app.qml (+101/-23)
app/ui/AddToPlaylist.qml (+5/-2)
app/ui/Albums.qml (+5/-2)
app/ui/ArtistView.qml (+12/-2)
app/ui/Artists.qml (+5/-2)
app/ui/ContentHubExport.qml (+34/-26)
app/ui/Genres.qml (+5/-2)
app/ui/NowPlaying.qml (+113/-77)
app/ui/Playlists.qml (+5/-2)
app/ui/Recent.qml (+41/-15)
app/ui/SongsView.qml (+5/-35)
debian/changelog (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1253761: Implement initial conditional layout framework	Medium	Fix Released
Bug #1320252: [Tablet]Cannot Go Into Landscape	Medium	Fix Released

Link a bug report

Related blueprints

984. By Andrew Hayzen on 2016-04-06

* Create a separate page head state for FullView to get around flickable changing causing header to disappear

983. By Andrew Hayzen on 2016-03-28

* Removal of the last PageHeadState to PageHeader

982. By Andrew Hayzen on 2016-03-28

* Merge of trunk
* Fixes for SongView to use PageHeader instead of PageHeadState

981. By Andrew Hayzen on 2016-03-28

* Switch to using extension: Sections {} rather than sections: {} as that is deprecated

980. By Andrew Hayzen on 2016-03-07

* Various fixes

979. By Andrew Hayzen on 2016-03-04

* Set flickable on fallback PageHeader

978. By Andrew Hayzen on 2016-03-04

* Set divider to be darker not lighter

977. By Andrew Hayzen on 2016-03-04

* Add missing file and set dividor colour

976. By Andrew Hayzen on 2016-03-04

* Add changelog :-)

975. By Andrew Hayzen on 2016-03-04

* Merge of trunk