Merge lp://qastaging/~music-app-dev/music-app/prototype-now-playing-side-panel into lp://qastaging/music-app/remix
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~music-app-dev/music-app/prototype-now-playing-side-panel |
| Merge into: | lp://qastaging/music-app/remix |
| Diff against target: |
5322 lines (+2426/-1833) (has conflicts) 55 files modified
CMakeLists.txt (+13/-7) app/CMakeLists.txt (+10/-0) app/components/BlurredBackground.qml (+1/-1) app/components/CMakeLists.txt (+6/-2) app/components/CoverGrid.qml (+2/-2) app/components/Dialog/CMakeLists.txt (+4/-0) app/components/Dialog/ContentHubErrorDialog.qml (+38/-0) app/components/Dialog/ContentHubNotFoundDialog.qml (+46/-0) app/components/Dialog/ContentHubWaitDialog.qml (+37/-0) app/components/Dialog/EditPlaylistDialog.qml (+80/-0) app/components/Dialog/NewPlaylistDialog.qml (+75/-0) app/components/Dialog/RemovePlaylistDialog.qml (+59/-0) app/components/Flickables/CMakeLists.txt (+4/-0) app/components/Flickables/CardView.qml (+1/-0) app/components/Flickables/MultiSelectListView.qml (+51/-0) app/components/Flickables/MusicListView.qml (+32/-0) app/components/HeadState/CMakeLists.txt (+4/-0) app/components/HeadState/MultiSelectHeadState.qml (+108/-0) app/components/HeadState/PlaylistsHeadState.qml (+47/-0) app/components/HeadState/SearchableHeadState.qml (+34/-0) app/components/LibraryListModel.qml (+2/-2) app/components/ListItemActions/AddToPlaylist.qml (+2/-8) app/components/ListItemActions/AddToQueue.qml (+1/-1) app/components/MusicPage.qml (+2/-2) app/components/MusicRow.qml (+1/-1) app/components/MusicToolbar.qml (+244/-314) app/components/NowPlaying.qml (+550/-0) app/components/PlaylistsEmptyState.qml (+58/-0) app/components/ViewButton/CMakeLists.txt (+4/-0) app/components/ViewButton/PlayAllButton.qml (+34/-0) app/components/ViewButton/QueueAllButton.qml (+46/-0) app/components/ViewButton/ShuffleButton.qml (+46/-0) app/components/Walkthrough/Slide1.qml (+1/-1) app/components/Walkthrough/Slide2.qml (+1/-1) app/components/Walkthrough/Slide3.qml (+1/-1) app/components/Walkthrough/Walkthrough.qml (+1/-1) app/components/WorkerModelLoader.qml (+1/-1) app/logic/CMakeLists.txt (+4/-0) app/music-app.qml (+352/-155) app/ui/AddToPlaylist.qml (+22/-23) app/ui/Albums.qml (+22/-27) app/ui/ArtistView.qml (+29/-73) app/ui/Artists.qml (+19/-25) app/ui/CMakeLists.txt (+4/-0) app/ui/Genres.qml (+21/-26) app/ui/LibraryEmptyState.qml (+123/-0) app/ui/NowPlayingView.qml (+23/-624) app/ui/Playlists.qml (+31/-39) app/ui/Recent.qml (+18/-23) app/ui/Songs.qml (+23/-118) app/ui/SongsView.qml (+40/-283) click/CMakeLists.txt (+0/-15) tests/autopilot/music_app/__init__.py (+38/-44) tests/autopilot/music_app/tests/__init__.py (+2/-2) tests/autopilot/music_app/tests/test_music.py (+8/-11) Text conflict in app/music-app.qml |
| To merge this branch: | bzr merge lp://qastaging/~music-app-dev/music-app/prototype-now-playing-side-panel |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Music App Developers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-02-10.
Commit message
* Conditional layouts for the music app
Description of the change
DO NOT MERGE, just want to keep this MP to see a diff of what's been added.
Unmerged revisions
- 842. By Victor Thompson
-
Add ItemLayout to the Layouts.
- 841. By Victor Thompson
-
start conditional layout prototype
- 840. By Andrew Hayzen
-
* Create generic MultiSelectList
View.qml for handling multiselect
* Create MusicListView.qml with our patches to ListView
* Move Flickables from components into their own Flickables folder.Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.
- 839. By Andrew Hayzen
-
* Do not allow LibraryEmptyState loader to be active if content-hub is running. Fixes: https:/
/bugs.launchpad .net/bugs/ 1418366. Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.
- 838. By Andrew Hayzen
-
* Move all Dialog components into their own files in components/Dialog.
Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.
- 837. By Andrew Hayzen
-
* Create common components for Play All, Queue All and Shuffle buttons within 'Views'.
Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.
- 836. By Andrew Hayzen
-
* Split EmptyStates into a page (for noMusic) and a component (for noPlaylists) and load in async.
Approved by Ubuntu Phone Apps Jenkins Bot, Victor Thompson.
- 835. By Andrew Hayzen
-
* Move existing head states into HeadState folder
* Create MultiSelectHeadState SearchableHeadState PlaylistHeadState
* Migrate AddToPlaylist Albums Artists Genres NowPlaying Playlists Songs SongsView to use the new HeadState.Approved by Ubuntu Phone Apps Jenkins Bot, Victor Thompson.
- 834. By Andrew Hayzen
-
* Make use of SDK PageStack.push(url, properties) instead of creating the component, object and pushing ourselves.
Approved by Victor Thompson, Ubuntu Phone Apps Jenkins Bot.
- 833. By Andrew Hayzen
-
* Rename common to components
* Move all qml components in components
* Move any JS scripts into logic.Approved by Ubuntu Phone Apps Jenkins Bot, Victor Thompson.
