Merge lp:~mikemc/ubuntuone-ios-music/back-to-5.1 into lp:ubuntuone-ios-music

[Mike McCracken]

A couple of minor changes to build correctly with 5.1 SDK.

A couple of minor changes to build correctly with 5.1 SDK.

As far as I could tell, the extra indexpath arg on the dequeue function is just an optimization.
The other change is just syntax.

[Paul Hummer (rockstar)]

I wonder if there's value in putting this in conditionals, like:

if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 6.0f) {
    // Do iOS 5 stuff
} else {
    // Do iOS 6 stuff
}

Then we've clearly marked places where a bump to minimum iOS 6 could clear out some easy code.

[Mike McCracken (mikemc)]

Good idea, done. I had to do the check at compile time though, since the symbol doesn't exist in the 5.1 SDK so it won't build if we try to do it at runtime.

[lp:~mikemc/ubuntuone-ios-music/back-to-5.1]

260. By Mike McCracken on 2013-03-19

Use new dequeue method when compiling for iOS 6+, and clearly mark a place where old code can be removed when we drop support for iOS 5.

261. By Mike McCracken on 2013-03-19

Conditionally use iOS6 only dequeue function. Mark for future droppings.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'Music/View Controllers/AlbumViewController.m'
--- Music/View Controllers/AlbumViewController.m	2013-02-13 06:37:52 +0000
+++ Music/View Controllers/AlbumViewController.m	2013-03-19 16:44:21 +0000
@@ -97,7 +97,13 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *CellIndentifier = @"Cell";
-    SongCell *cell = [self.tableView dequeueReusableCellWithIdentifier:CellIndentifier forIndexPath:indexPath];
+    SongCell *cell;
+#ifdef __IPHONE_6_0
+    cell = [self.tableView dequeueReusableCellWithIdentifier:CellIndentifier forIndexPath:indexPath];
+#else
+    // iOS 5
+    cell = [self.tableView dequeueReusableCellWithIdentifier:CellIndentifier];
+#endif
     Song *song = [tableData objectAtIndex:indexPath.row];
     cell.showArt = NO;
     [cell setSong:song];

=== modified file 'Music/View Controllers/ArtistViewController.m'
--- Music/View Controllers/ArtistViewController.m	2013-02-11 03:55:13 +0000
+++ Music/View Controllers/ArtistViewController.m	2013-03-19 16:44:21 +0000
@@ -90,7 +90,14 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *CellIndentifier = @"Cell";
-    AlbumCell *cell = [self.tableView dequeueReusableCellWithIdentifier:CellIndentifier forIndexPath:indexPath];
+    AlbumCell *cell;
+#ifdef __IPHONE_6_0
+    cell = [self.tableView dequeueReusableCellWithIdentifier:CellIndentifier forIndexPath:indexPath];
+#else
+    // iOS 5
+    cell = [self.tableView dequeueReusableCellWithIdentifier:CellIndentifier];
+#endif
+
     Album *album = [tableData objectAtIndex:indexPath.row];
     [cell setAlbum:album];
     return cell;

=== modified file 'Music/View Controllers/UOIndexedViewController.m'
--- Music/View Controllers/UOIndexedViewController.m	2013-02-07 06:37:58 +0000
+++ Music/View Controllers/UOIndexedViewController.m	2013-03-19 16:44:21 +0000
@@ -85,18 +85,18 @@
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    id <NSFetchedResultsSectionInfo> sectionInfo = [self.fetchedResultsController sections][section];
+    id <NSFetchedResultsSectionInfo> sectionInfo = [[self.fetchedResultsController sections] objectAtIndex:section];
     return [sectionInfo numberOfObjects];
 }
 
 - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-    id <NSFetchedResultsSectionInfo> sectionInfo = [self.fetchedResultsController sections][section];
+    id <NSFetchedResultsSectionInfo> sectionInfo = [[self.fetchedResultsController sections] objectAtIndex:section];
     return [sectionInfo name];
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *CellIdentifier = @"Cell";
-    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
     
     [self configureCell:cell forIndexPath:indexPath];
     return cell;