Merge lp:~urbanape/ubuntuone-ios-client/2.0-release into lp:ubuntuone-ios-client

[Zachery Bir]

This branch makes the Done button take precedent over the Now Playing button when in playlist edit mode, requires confirmation before clearing or deleting a playlist, and properly uses the default album art when in playback mode, if the track doesn't have its own album art.

[Jason Foreman (threeve)]

Approved, assuming the fix from lp:~threeve/ubuntuone-ios-client/fix-clear-edit-playlist is merged in.

review: Approve

[lp:~urbanape/ubuntuone-ios-client/2.0-release]

202. By Zachery Bir on 2011-06-23

Merged fix-clear-edit-playlist

203. By Zachery Bir on 2011-06-23

Bumped version

=== modified file 'musicstreaming/iSub-Info.plist'
--- musicstreaming/iSub-Info.plist	2011-06-22 19:22:45 +0000
+++ musicstreaming/iSub-Info.plist	2011-06-23 18:49:47 +0000
@@ -41,7 +41,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>17</string>
 	<key>LSRequiresIPhoneOS</key>
 	<false/>
 	<key>NSMainNibFile</key>

=== modified file 'musicstreaming/view_controllers/AlbumViewController.m'
--- musicstreaming/view_controllers/AlbumViewController.m	2011-06-22 19:22:45 +0000
+++ musicstreaming/view_controllers/AlbumViewController.m	2011-06-23 18:49:47 +0000
@@ -325,7 +325,6 @@
 															   cancelButtonItem:cancelButton otherButtonItems:dismissButton, nil];
 					[alertView show];
 					[alertView release];
-
 				}
 			}
         }

=== modified file 'musicstreaming/view_controllers/PlaylistEditAlbumListViewController.m'
--- musicstreaming/view_controllers/PlaylistEditAlbumListViewController.m	2011-05-27 18:37:16 +0000
+++ musicstreaming/view_controllers/PlaylistEditAlbumListViewController.m	2011-06-23 18:49:47 +0000
@@ -22,6 +22,8 @@
 #import "Playlist.h"
 #import "Album.h"
 #import "PlaylistEditAlbumViewController.h"
+#import "StreamingPlayer.h"
+#import "Reachability.h"
 
 
 @implementation PlaylistEditAlbumListViewController
@@ -33,13 +35,22 @@
     PlaylistEditAlbumListViewController *playlistEditAlbumListViewController = [[[PlaylistEditAlbumListViewController alloc] initWithTitle:NSLocalizedString(@"Albums", @"")] autorelease];
     playlistEditAlbumListViewController.originator = originator;
     playlistEditAlbumListViewController.navigationItem.prompt = [NSString stringWithFormat:@"%@ \"%@\".", NSLocalizedString(@"Add songs to", @""), originator.playlist.name];
-    playlistEditAlbumListViewController.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:originator action:@selector(finish:)] autorelease];
     UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:playlistEditAlbumListViewController] autorelease];
     nav.navigationBar.barStyle = UIBarStyleBlack;
     nav.tabBarItem.image = [[UIImage imageNamed:@"albums"] autorelease];
     return nav;
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+
+	self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:originator action:@selector(finish:)] autorelease];
+
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
+	[self updateReachability:[[Subsonic sharedSubsonic] reachability]];
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
 	Album *selection = nil;

=== modified file 'musicstreaming/view_controllers/PlaylistEditAlbumViewController.m'
--- musicstreaming/view_controllers/PlaylistEditAlbumViewController.m	2011-06-22 16:06:39 +0000
+++ musicstreaming/view_controllers/PlaylistEditAlbumViewController.m	2011-06-23 18:49:47 +0000
@@ -23,6 +23,8 @@
 #import "Song.h"
 #import "PlaylistEditSongUITableViewCell.h"
 #import "NSDate+Extras.h"
+#import "StreamingPlayer.h"
+#import "Reachability.h"
 
 @implementation PlaylistEditAlbumViewController
 @synthesize originator;
@@ -34,10 +36,20 @@
     {
         self.originator = playlistEditViewController;
         self.navigationItem.prompt = [NSString stringWithFormat:@"%@ \"%@\".", NSLocalizedString(@"Add songs to", @""), self.originator.playlist.name];
-        self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:self.originator action:@selector(finish:)] autorelease];
     }
     return self;
 }
+
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+	
+	self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:originator action:@selector(finish:)] autorelease];
+
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
+	[self updateReachability:[[Subsonic sharedSubsonic] reachability]];
+}
+
 #pragma mark - Table view data source
 
 - (UITableViewCell *)tableView:(UITableView *)tv cellForRowAtIndexPath:(NSIndexPath *)indexPath

=== modified file 'musicstreaming/view_controllers/PlaylistEditArtistListViewController.m'
--- musicstreaming/view_controllers/PlaylistEditArtistListViewController.m	2011-05-27 18:37:16 +0000
+++ musicstreaming/view_controllers/PlaylistEditArtistListViewController.m	2011-06-23 18:49:47 +0000
@@ -22,6 +22,8 @@
 #import "PlaylistEditViewController.h"
 #import "Playlist.h"
 #import "Artist.h"
+#import "StreamingPlayer.h"
+#import "Reachability.h"
 
 
 @implementation PlaylistEditArtistListViewController
@@ -33,13 +35,22 @@
     PlaylistEditArtistListViewController *playlistEditArtistListViewController = [[[PlaylistEditArtistListViewController alloc] initWithTitle:NSLocalizedString(@"Artists", @"")] autorelease];
     playlistEditArtistListViewController.originator = originator;
     playlistEditArtistListViewController.navigationItem.prompt = [NSString stringWithFormat:@"%@ \"%@\".", NSLocalizedString(@"Add songs to", @""), originator.playlist.name];
-    playlistEditArtistListViewController.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:originator action:@selector(finish:)] autorelease];
     UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:playlistEditArtistListViewController] autorelease];
     nav.navigationBar.barStyle = UIBarStyleBlack;
     nav.tabBarItem.image = [[UIImage imageNamed:@"artists"] autorelease];
     return nav;
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+	
+	self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:originator action:@selector(finish:)] autorelease];
+
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
+	[self updateReachability:[[Subsonic sharedSubsonic] reachability]];
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath 
 {
 	Artist *selection = nil;

=== modified file 'musicstreaming/view_controllers/PlaylistEditArtistViewController.m'
--- musicstreaming/view_controllers/PlaylistEditArtistViewController.m	2011-05-18 14:26:11 +0000
+++ musicstreaming/view_controllers/PlaylistEditArtistViewController.m	2011-06-23 18:49:47 +0000
@@ -23,6 +23,8 @@
 #import "Album.h"
 #import "Artist.h"
 #import "Playlist.h"
+#import "StreamingPlayer.h"
+#import "Reachability.h"
 
 
 @implementation PlaylistEditArtistViewController
@@ -35,11 +37,20 @@
     {
         self.originator = playlistEditViewController;
         self.navigationItem.prompt = [NSString stringWithFormat:@"%@ \"%@\".", NSLocalizedString(@"Add songs to", @""), self.originator.playlist.name];
-        self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:self.originator action:@selector(finish:)] autorelease];
     }
     return self;
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+	
+	self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:originator action:@selector(finish:)] autorelease];
+
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
+	[self updateReachability:[[Subsonic sharedSubsonic] reachability]];
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
 	if (0 == indexPath.section)

=== modified file 'musicstreaming/view_controllers/PlaylistEditSongListViewController.m'
--- musicstreaming/view_controllers/PlaylistEditSongListViewController.m	2011-06-22 16:06:39 +0000
+++ musicstreaming/view_controllers/PlaylistEditSongListViewController.m	2011-06-23 18:49:47 +0000
@@ -22,6 +22,8 @@
 #import "PlaylistSongIndex.h"
 #import "Playlist.h"
 #import "Song.h"
+#import "StreamingPlayer.h"
+#import "Reachability.h"
 
 
 @implementation PlaylistEditSongListViewController
@@ -32,13 +34,22 @@
     PlaylistEditSongListViewController *playlistEditSongListViewController = [[[PlaylistEditSongListViewController alloc] initWithTitle:NSLocalizedString(@"Songs", @"")] autorelease];
     playlistEditSongListViewController.originator = originator;
     playlistEditSongListViewController.navigationItem.prompt = [NSString stringWithFormat:@"%@ \"%@\".", NSLocalizedString(@"Add songs to", @""), originator.playlist.name];
-    playlistEditSongListViewController.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:originator action:@selector(finish:)] autorelease];
     UINavigationController *nav = [[[UINavigationController alloc] initWithRootViewController:playlistEditSongListViewController] autorelease];
     nav.navigationBar.barStyle = UIBarStyleBlack;
     nav.tabBarItem.image = [[UIImage imageNamed:@"songs"] autorelease];
     return nav;
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+	
+	self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:UIBarButtonItemStylePlain target:originator action:@selector(finish:)] autorelease];
+
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
+	[self updateReachability:[[Subsonic sharedSubsonic] reachability]];
+}
+
 #pragma mark - UITableView
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath 

=== modified file 'musicstreaming/view_controllers/PlaylistViewController.m'
--- musicstreaming/view_controllers/PlaylistViewController.m	2011-06-21 17:04:19 +0000
+++ musicstreaming/view_controllers/PlaylistViewController.m	2011-06-23 18:49:47 +0000
@@ -23,6 +23,8 @@
 #import "PlaylistParser.h"
 #import "Song.h"
 #import "NSMutableArray+Extras.h"
+#import "RIButtonItem.h"
+#import "UIAlertView+Blocks.h"
 
 @interface PlaylistViewController ()
 - (void)deleteLocalPlaylist;
@@ -115,14 +117,12 @@
 - (void)didReceiveMemoryWarning
 {
     [super didReceiveMemoryWarning];
-	
-	self.playlist = NULL;
 }
 
 - (void)dealloc
 {
-	self.playlist = NULL;
-    
+	self.playlist = nil;
+    self.songs = nil;
 	[super dealloc];
 }
 
@@ -217,27 +217,55 @@
 
 - (void)clearPlaylist
 {
-    self.playlist.playlistSongIndexes = nil;
-    self.songs = nil;
-	SaveContext();
-    [self.tableView reloadData];
+	RIButtonItem *cancelButton = [RIButtonItem item];
+	cancelButton.label = NSLocalizedString(@"Cancel", @"");
+	
+	RIButtonItem *clearButton = [RIButtonItem item];
+	clearButton.label = NSLocalizedString(@"Clear", @"");
+	clearButton.action = ^
+	{
+		self.playlist.playlistSongIndexes = nil;
+		[self.songs removeAllObjects];
+		SaveContext();
+		[self.tableView reloadData];
+	};
+
+	UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Clear Playlist", @"")
+														message:NSLocalizedString(@"This will clear this playlist. It cannot be undone.", @"")
+											   cancelButtonItem:cancelButton otherButtonItems:clearButton, nil];
+	[alertView show];
+	[alertView release];
 }
 
 - (void)deletePlaylist
 {
-	if (self.playlist.playlistId)
-	{
-		NSMutableArray *extraParameters = [NSMutableArray array];
-		[extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlist.playlistId, nil]];
-		NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"deletePlaylist.view" parameters:extraParameters];
-		NSURLRequest *request = [[[NSURLRequest alloc] initWithURL:url] autorelease];
-		NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:self];
-		[connection start];
-	}
-	else
-	{
-		[self deleteLocalPlaylist];
-	}
+	RIButtonItem *cancelButton = [RIButtonItem item];
+	cancelButton.label = NSLocalizedString(@"Cancel", @"");
+	
+	RIButtonItem *deleteButton = [RIButtonItem item];
+	deleteButton.label = NSLocalizedString(@"Delete", @"");
+	deleteButton.action = ^
+	{
+		if (self.playlist.playlistId)
+		{
+			NSMutableArray *extraParameters = [NSMutableArray array];
+			[extraParameters addKeyValueObjectFromArray:[NSArray arrayWithObjects:@"id", self.playlist.playlistId, nil]];
+			NSURL *url = [[Subsonic sharedSubsonic] getBaseURL:@"deletePlaylist.view" parameters:extraParameters];
+			NSURLRequest *request = [[[NSURLRequest alloc] initWithURL:url] autorelease];
+			NSURLConnection *connection = [NSURLConnection connectionWithRequest:request delegate:self];
+			[connection start];
+		}
+		else
+		{
+			[self deleteLocalPlaylist];
+		}
+	};
+
+	UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Delete Playlist", @"")
+														message:NSLocalizedString(@"This will delete this playlist. It cannot be undone.", @"")
+											   cancelButtonItem:cancelButton otherButtonItems:deleteButton, nil];
+	[alertView show];
+	[alertView release];
 }
 
 - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response

=== modified file 'musicstreaming/view_controllers/SongViewController.m'
--- musicstreaming/view_controllers/SongViewController.m	2011-06-18 02:04:11 +0000
+++ musicstreaming/view_controllers/SongViewController.m	2011-06-23 18:49:47 +0000
@@ -400,6 +400,10 @@
             [loader download:albumCoverArtId];
         }
     }
+	else
+	{
+		coverArtImageView.image = [loader defaultAlbumArt];
+	}
 
 	[StreamingPlayer sharedStreamingPlayer].currentCoverArt = coverArtImageView.image;
 }