Add full support for iPad

cigraphics · Jan 7, 2011 · 352064b · 352064b
1 parent 49b1f01
commit 352064b
Show file tree

Hide file tree

Showing 12 changed files with 532 additions and 24 deletions.
diff --git a/Classes/Data/Story.m b/Classes/Data/Story.m
@@ -76,18 +76,19 @@ + (Story *)storyWithDictionary:(NSDictionary *)dict inReddit:(id)reddit
 	aStory.isSelfReddit = ([aStory.domain rangeOfString:@"self."].location == 0);
 
 	UIFont *storyFont = [UIFont boldSystemFontOfSize:14];
+	CGSize screenSize = [UIScreen mainScreen].bounds.size;
 	CGFloat height;
 
-	height = (CGFloat)([aStory.title sizeWithFont:storyFont constrainedToSize:CGSizeMake(266.0, 1000.0) lineBreakMode:UILineBreakModeTailTruncation]).height;
+	height = (CGFloat)([aStory.title sizeWithFont:storyFont constrainedToSize:CGSizeMake(screenSize.width - 54.0, 1000.0) lineBreakMode:UILineBreakModeTailTruncation]).height;
 	[aStory setHeight:height forIndex:PORTRAIT_INDEX];
 
-	height = (CGFloat)([aStory.title sizeWithFont:storyFont constrainedToSize:CGSizeMake(266.0-68.0, 1000.0) lineBreakMode:UILineBreakModeTailTruncation]).height;
+	height = (CGFloat)([aStory.title sizeWithFont:storyFont constrainedToSize:CGSizeMake(screenSize.width - (54.0+68.0), 1000.0) lineBreakMode:UILineBreakModeTailTruncation]).height;
 	[aStory setHeight:height forIndex:PORTRAIT_THUMBNAIL_INDEX];
 
-	height = (CGFloat)[aStory.title sizeWithFont:storyFont constrainedToSize:CGSizeMake(428.0, 1000.0) lineBreakMode:UILineBreakModeTailTruncation].height;
+	height = (CGFloat)[aStory.title sizeWithFont:storyFont constrainedToSize:CGSizeMake(screenSize.height - 52.0, 1000.0) lineBreakMode:UILineBreakModeTailTruncation].height;
 	[aStory setHeight:height forIndex:LANDSCAPE_INDEX];
 
-	height = (CGFloat)[aStory.title sizeWithFont:storyFont constrainedToSize:CGSizeMake(428.0-68.0, 1000.0) lineBreakMode:UILineBreakModeTailTruncation].height;
+	height = (CGFloat)[aStory.title sizeWithFont:storyFont constrainedToSize:CGSizeMake(screenSize.height - (52.0+68.0), 1000.0) lineBreakMode:UILineBreakModeTailTruncation].height;
 	[aStory setHeight:height forIndex:LANDSCAPE_THUMBNAIL_INDEX];
 
 	[storyDictionary setObject:aStory forKey:aStory.identifier];

diff --git a/Classes/ViewControllers/RootViewController.m b/Classes/ViewControllers/RootViewController.m
@@ -192,7 +192,9 @@ - (void)viewDidLoad {
 - (void)viewWillAppear:(BOOL)animated
 {
     self.navigationBarTintColor = [iRedditAppDelegate redditNavigationBarTintColor];
-    self.tableView.backgroundColor = [UIColor colorWithRed:229.0/255.0 green:238.0/255.0 blue:1 alpha:1];
+	if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+		self.tableView.backgroundColor = [UIColor colorWithRed:229.0/255.0 green:238.0/255.0 blue:1 alpha:1];
+	}
 	self.tableView.allowsSelectionDuringEditing = NO;
 	self.tableView.editing = NO;
 

diff --git a/Classes/ViewControllers/SettingsViewController.m b/Classes/ViewControllers/SettingsViewController.m
@@ -83,7 +83,9 @@ - (void)loadView
 
 	self.tableView = [[[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped] autorelease];
 	self.tableView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-	self.tableView.backgroundColor = [UIColor colorWithRed:229.0/255.0 green:238.0/255.0 blue:1 alpha:1];
+	if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+		self.tableView.backgroundColor = [UIColor colorWithRed:229.0/255.0 green:238.0/255.0 blue:1 alpha:1];
+	}
 
 	[self.view addSubview:self.tableView];
 }

diff --git a/Classes/ViewControllers/StoryViewController.h b/Classes/ViewControllers/StoryViewController.h
@@ -18,9 +18,11 @@
 	UIWebView	*webview;
 	UIButton	*scoreItem;
 	UIButton	*commentCountItem;
-	UIBarButtonItem	*toggleButtonItem;	
+	UIBarButtonItem	*toggleButtonItem;
+	UIBarButtonItem *moreButtonItem;
 	UISegmentedControl *segmentedControl;
 	AlienProgressView  *loadingView;
+	UIActionSheet *currentSheet;
 
 	Story	*story;
 }

diff --git a/Classes/ViewControllers/StoryViewController.m b/Classes/ViewControllers/StoryViewController.m
@@ -83,7 +83,9 @@ - (void)loadView
 	self.toggleButtonItem = [items lastObject];
 
 	[items addObject:[[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil] autorelease]];
-	[items addObject:[[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(share:)] autorelease]];
+	if (!moreButtonItem)
+		moreButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(share:)];
+	[items addObject:moreButtonItem];
 
 	[self setToolbarItems:items animated:NO];
 
@@ -348,25 +350,38 @@ - (IBAction)showStory:(id)sender
 
 - (IBAction)share:(id)sender
 {
-	UIActionSheet *actionSheet = [[UIActionSheet alloc]
-								  initWithTitle:@""
-								  delegate:(id <UIActionSheetDelegate>)self
-								  cancelButtonTitle:@"Cancel"
-								  destructiveButtonTitle:nil
-								  otherButtonTitles:@"E-mail Link", @"Open Link in Safari", @"Hide on reddit", @"Save on reddit", @"Save on Instapaper", nil];
-
-	actionSheet.actionSheetStyle = UIActionSheetStyleDefault;
-
-	[actionSheet showInView:self.navigationController.view];
-	[actionSheet release];
+	if (currentSheet) {
+		[currentSheet dismissWithClickedButtonIndex:currentSheet.cancelButtonIndex animated:YES];
+		[currentSheet release];
+		currentSheet = nil;
+	} else {
+		currentSheet = [[UIActionSheet alloc]
+						initWithTitle:@""
+						delegate:(id <UIActionSheetDelegate>)self
+						cancelButtonTitle:@"Cancel"
+						destructiveButtonTitle:nil
+						otherButtonTitles:@"E-mail Link", @"Open Link in Safari", @"Hide on reddit", @"Save on reddit", @"Save on Instapaper", nil];
+
+		currentSheet.actionSheetStyle = UIActionSheetStyleDefault;
+
+		if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+			[currentSheet showInView:self.navigationController.view];
+		} else {
+			[currentSheet showFromBarButtonItem:moreButtonItem animated:YES];
+		}
+	}
 }
 
 - (void)actionSheetCancel:(id)sender
-{	
+{
+	[currentSheet release];
+	currentSheet = nil;
 }
 
 - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex 
 {
+	[currentSheet release];
+	currentSheet = nil;
 	NSString *url = story.URL;
 	if (isForComments && story.commentsURL)
 		url = story.commentsURL;
@@ -442,7 +457,7 @@ - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger
 		//[[Beacon shared] startSubBeaconWithName:@"instapaper" timeSession:NO];
 	}
 	else if(buttonIndex == 4)
-		[self actionSheetCancel:actionSheet];
+		[self actionSheetCancel:currentSheet];
 }
 
 - (void)mailComposeController:(MFMailComposeViewController*)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError*)error
@@ -644,6 +659,8 @@ - (void)viewDidUnload
 - (void)dealloc 
 {
 	self.story = nil;
+	[currentSheet release];
+	[moreButtonItem release];
 
     [super dealloc];
 }

diff --git a/Classes/ViewControllers/SubredditViewController.m b/Classes/ViewControllers/SubredditViewController.m
@@ -55,7 +55,8 @@ - (void)loadView
 	[super loadView];
 
     // create the tableview
-    self.view = [[[UIView alloc] initWithFrame:TTApplicationFrame()] autorelease];
+	CGRect applicationFrame = TTApplicationFrame();
+    self.view = [[[UIView alloc] initWithFrame:applicationFrame] autorelease];
     self.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
 	if (tabBar)
@@ -66,7 +67,7 @@ - (void)loadView
 
 	if (showTabBar)
 	{
-		tabBar = [[TTTabStrip alloc] initWithFrame:CGRectMake(0, 0, 320, 36)];
+		tabBar = [[TTTabStrip alloc] initWithFrame:CGRectMake(0, 0, applicationFrame.size.width, 36)];
 
 		tabBar.tabItems = [NSArray arrayWithObjects:
 							 [[[TTTabItem alloc] initWithTitle:@"   Hot   "] autorelease],

diff --git a/Default-Landscape.png b/Default-Landscape.png
diff --git a/Default-Portrait.png b/Default-Portrait.png