Ubuntu One Music App for iOS

Merge lp://qastaging/~rockstar/ubuntuone-ios-music/coredata into lp://qastaging/~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty

  1. coredata
  2. Merge into moriarty
Proposed by Paul Hummer
Status: Merged
Merge reported by: Paul Hummer
Merged at revision: not available
Proposed branch: lp://qastaging/~rockstar/ubuntuone-ios-music/coredata
Merge into: lp://qastaging/~ubuntuone-ios-client-team/ubuntuone-ios-music/moriarty
Prerequisite: lp://qastaging/~rockstar/ubuntuone-ios-music/ui-and-flows
Diff against target: 1586 lines (+663/-307)
29 files modified
Music/AppDelegate.h (+2/-0)
Music/AppDelegate.m (+25/-12)
Music/Categories/NSString+Extras.m (+1/-2)
Music/Models/Album.h (+8/-5)
Music/Models/Album.m (+45/-5)
Music/Models/Artist.h (+5/-3)
Music/Models/Artist.m (+34/-13)
Music/Models/Playlist.h (+8/-7)
Music/Models/Playlist.m (+31/-4)
Music/Models/Song.h (+30/-17)
Music/Models/Song.m (+86/-11)
Music/Models/UOModel.h (+17/-0)
Music/Models/UOModel.m (+30/-0)
Music/Storyboard_iPhone.storyboard (+81/-12)
Music/UOMusic.xcdatamodeld/UOMusic.xcdatamodel/contents (+60/-0)
Music/View Controllers/AlbumViewController.m (+1/-1)
Music/View Controllers/AlbumsViewController.m (+21/-40)
Music/View Controllers/ArtistViewController.m (+2/-1)
Music/View Controllers/ArtistsViewController.m (+19/-41)
Music/View Controllers/PlaylistsViewController.m (+17/-33)
Music/View Controllers/SongsViewController.m (+17/-33)
Music/View Controllers/Table Cells/AlbumCell.m (+1/-1)
Music/View Controllers/Table Cells/ArtistCell.m (+7/-7)
Music/View Controllers/Table Cells/PlaylistCell.m (+6/-7)
Music/View Controllers/Table Cells/SongCell.m (+1/-1)
Music/View Controllers/UOIndexedViewController.h (+7/-1)
Music/View Controllers/UOIndexedViewController.m (+86/-33)
U1Music.xcodeproj/project.pbxproj (+15/-9)
music.xcdatamodeld/.xccurrentversion (+0/-8)
To merge this branch: bzr merge lp://qastaging/~rockstar/ubuntuone-ios-music/coredata
Reviewer Review Type Date Requested Status
Michał Karnicki (community) Approve
Review via email: mp+139111@code.qastaging.launchpad.net

Description of the change

This branch adds Core Data bindings to the RestKit retrieval. Now we ignore whatever RestKit passes to the delegate and pull everything from Core Data using NSFetchedResultsController. This works on all the base view controllers, but doesn't dial in to each view (though those views will use the same endpoints and data, rather than walking in via the API).

As usual, I don't plan on landing this in trunk until all these branches are landed.

To post a comment you must log in.
Revision history for this message
Michał Karnicki (karni) wrote :

Line 974. What's up with hardcoded 5?
Lines 876 and 1271 are commented. Intentional?

With that, I'm giving this a +1, but I have to admit I still feel alien to Obj C code base.

review: Approve
Revision history for this message
Paul Hummer (rockstar) wrote :

Yeah, the hardcoded 5 is because it's just placeholder text. The other commented out stuff is placeholder text as well.

lp://qastaging/~rockstar/ubuntuone-ios-music/coredata updated
277. By Paul Hummer

Merged ui-and-flows into coredata.

278. By Paul Hummer

Merged moriarty into coredata.

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