Merge lp:~mikemc/ubuntuone-ios-files/use-options-menu into lp:ubuntuone-ios-files

[Mike McCracken]

Use "options menu" instead of "open-in" menu to let users do more things with downloaded files.

See bug LP: #1186362 for a screenshot of the new options menu from the simulator

presents a menu with a superset of functionality, adding useful things like save to photo roll or tweet/fb/weibo an image, or mail the file for other files.

NOTE, also adds an autorelease for the alert view, since it will leak. However, it looks like since you can always email a file, we may never create that alert view in the first place. Still.

[dobey (dobey)]

review: Approve

=== modified file 'Files/U1FileDetailsViewController.m'
--- Files/U1FileDetailsViewController.m	2013-05-24 18:26:45 +0000
+++ Files/U1FileDetailsViewController.m	2013-05-31 18:07:36 +0000
@@ -324,43 +324,16 @@
 	[self.navigationController pushViewController:previewController animated:YES];
 	[previewController release];
 	
-//	QLPreviewController *previewController = [[QLPreviewController alloc] init];
-//	previewController.dataSource = self;
-//	previewController.delegate = self;
-//
-//	UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 20)];
-//	// TODO: Ubuntu font
-//	[titleLabel setFont:[UIFont boldSystemFontOfSize:18.f]];
-//	[titleLabel setTextColor:[UIColor blackColor]];
-//	[titleLabel setShadowColor:[UIColor whiteColor]];
-//	[titleLabel setShadowOffset:CGSizeMake(-1, -1)];
-//	[titleLabel setText:self.title];
-//	[titleLabel sizeToFit];
-//	[titleLabel setOpaque:NO];
-//	[titleLabel setBackgroundColor:[UIColor clearColor]];
-//	[previewController.navigationItem setTitleView:titleLabel];
-//	[titleLabel release];
-//
-////	[self.navigationController presentModalViewController:previewController animated:YES];
-//	[self.navigationController pushViewController:previewController animated:YES];
-//	[previewController release];
-//
-//	// TODO: manage preview view vs. modal presentation
-////	UIView *previewView = previewController.view;
-////	previewView.frame = [self.view bounds];
-////	[previewController viewWillAppear:NO];
-////	[self.view addSubview:previewView];
-////	[previewController viewDidAppear:NO];
 }
 
 - (IBAction)openIn:(UIBarButtonItem*)sender;
 {
-	BOOL success = [self.docController presentOpenInMenuFromBarButtonItem:sender animated:YES];
+	BOOL success = [self.docController presentOptionsMenuFromBarButtonItem:sender animated:YES];
 	if(!success){
-		UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"Unable to Open File"
-															message:@"No apps that can open this file type were found."
+		UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"No Options Available"
+															message:@"No external options found for this file type."
 														   delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
-		[alertView show];
+		[[alertView autorelease] show];
 	}
 }
 
 
=== modified file 'Files/U1FilePreviewViewController.m'
--- Files/U1FilePreviewViewController.m	2013-04-03 23:01:10 +0000
+++ Files/U1FilePreviewViewController.m	2013-05-31 18:07:36 +0000
@@ -178,12 +178,12 @@
 
 - (IBAction)openIn:(UIBarButtonItem*)sender;
 {
-	BOOL success = [self.docController presentOpenInMenuFromBarButtonItem:sender animated:YES];
+	BOOL success = [self.docController presentOptionsMenuFromBarButtonItem:sender animated:YES];
 	if(!success){
-		UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"Unable to Open File"
-															message:@"No apps that can open this file type were found."
+		UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"No Options Available"
+															message:@"No external options found for this file type."
 														   delegate:nil cancelButtonTitle:@"OK" otherButtonTitles:nil];
-		[alertView show];
+		[[alertView autorelease] show];
 	}
 }