diff --git a/media/iphone/Classes/NewsBlurAppDelegate.h b/media/iphone/Classes/NewsBlurAppDelegate.h index 13403d5f2..83e8c4a02 100644 --- a/media/iphone/Classes/NewsBlurAppDelegate.h +++ b/media/iphone/Classes/NewsBlurAppDelegate.h @@ -22,6 +22,8 @@ UIWindow *window; UISplitViewController *splitStoryController; UINavigationController *navigationController; + UINavigationController *splitStoryDetailNavigationController; + NewsBlurViewController *feedsViewController; FeedDetailViewController *feedDetailViewController; StoryDetailViewController *storyDetailViewController; @@ -58,6 +60,7 @@ @property (nonatomic, retain) IBOutlet UIWindow *window; @property (nonatomic, retain) IBOutlet UISplitViewController *splitStoryController; @property (nonatomic, readonly, retain) IBOutlet UINavigationController *navigationController; +@property (nonatomic, readonly, retain) IBOutlet UINavigationController *splitStoryDetailNavigationController; @property (nonatomic, retain) IBOutlet NewsBlurViewController *feedsViewController; @property (nonatomic, retain) IBOutlet FeedDetailViewController *feedDetailViewController; @property (nonatomic, retain) IBOutlet StoryDetailViewController *storyDetailViewController; @@ -97,6 +100,7 @@ - (void)loadFeedDetailView; - (void)loadRiverFeedDetailView; - (void)loadStoryDetailView; +- (void)adjustStoryDetailWebView; - (void)reloadFeedsView:(BOOL)showLoader; - (void)hideNavigationBar:(BOOL)animated; - (void)showNavigationBar:(BOOL)animated; diff --git a/media/iphone/Classes/NewsBlurAppDelegate.m b/media/iphone/Classes/NewsBlurAppDelegate.m index 14bc0a40e..8c3508b43 100644 --- a/media/iphone/Classes/NewsBlurAppDelegate.m +++ b/media/iphone/Classes/NewsBlurAppDelegate.m @@ -25,6 +25,7 @@ @synthesize splitStoryController; @synthesize navigationController; +@synthesize splitStoryDetailNavigationController; @synthesize feedsViewController; @synthesize feedDetailViewController; @synthesize storyDetailViewController; @@ -69,7 +70,10 @@ navigationController.viewControllers = [NSArray arrayWithObject:feedsViewController]; [window addSubview:splitStoryController.view]; - splitStoryController.viewControllers = [NSArray arrayWithObjects:navigationController, detailViewController, nil]; + splitStoryDetailNavigationController.viewControllers = [NSArray arrayWithObject:detailViewController]; + [window addSubview:splitStoryController.view]; + + splitStoryController.viewControllers = [NSArray arrayWithObjects:navigationController, splitStoryDetailNavigationController, nil]; [window addSubview:splitStoryController.view]; @@ -229,12 +233,9 @@ storyDetailViewController.view.tag = 12; [detailViewController.view addSubview:storyDetailViewController.view]; - if (UIInterfaceOrientationIsPortrait(detailViewController.interfaceOrientation)) { - storyDetailViewController.view.frame = CGRectMake(0,0,768,1004); - } else { - storyDetailViewController.view.frame = CGRectMake(0,0,704,748); - } + [self adjustStoryDetailWebView]; + } else{ UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc] initWithTitle:feedTitle style: UIBarButtonItemStyleBordered target: nil action: nil]; [feedDetailViewController.navigationItem setBackBarButtonItem: newBackButton]; @@ -249,6 +250,15 @@ } +- (void)adjustStoryDetailWebView { + if (UIInterfaceOrientationIsPortrait(detailViewController.interfaceOrientation)) { + storyDetailViewController.view.frame = CGRectMake(0,0,768,960); + } else { + storyDetailViewController.view.frame = CGRectMake(0,0,704,704); + } + +} + - (void)navigationController:(UINavigationController *)navController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated { if (viewController == feedDetailViewController) { diff --git a/media/iphone/DetailViewController.h b/media/iphone/DetailViewController.h index 239d071d1..dfd7a374e 100644 --- a/media/iphone/DetailViewController.h +++ b/media/iphone/DetailViewController.h @@ -12,8 +12,10 @@ @interface DetailViewController : UIViewController { NewsBlurAppDelegate *appDelegate; + } +@property (nonatomic, retain) IBOutlet NewsBlurAppDelegate *appDelegate; @property (strong, nonatomic) UIPopoverController *masterPopoverController; diff --git a/media/iphone/DetailViewController.m b/media/iphone/DetailViewController.m index b2bc8f5f8..e3098278b 100644 --- a/media/iphone/DetailViewController.m +++ b/media/iphone/DetailViewController.m @@ -10,7 +10,9 @@ #import "NewsBlurAppDelegate.h" @implementation DetailViewController + @synthesize masterPopoverController = _masterPopoverController; +@synthesize appDelegate; - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { @@ -40,26 +42,14 @@ } - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration { -// NSArray *subviews = [[self.view subviews] copy]; -// for (UIView *subview in subviews) { -// if (subview.tag == 12) { -// if (toInterfaceOrientation == UIInterfaceOrientationPortrait || toInterfaceOrientation == UIInterfaceOrientationPortraitUpsideDown) { -// NSLog(@"portrait"); -// subview.frame = CGRectMake(0,44,768,960); -// } else { -// NSLog(@"landscape"); -// subview.frame = CGRectMake(0,44,704,704); -// } -// } -// } -// + [appDelegate adjustStoryDetailWebView]; } #pragma mark - Split view - (void)splitViewController:(UISplitViewController *)splitController willHideViewController:(UIViewController *)viewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)popoverController { - // barButtonItem.title = NSLocalizedString(@"Master", @"Master"); + barButtonItem.title = NSLocalizedString(@"NewsBlur", @"NewsBlur"); [self.navigationItem setLeftBarButtonItem:barButtonItem animated:YES]; self.masterPopoverController = popoverController; } @@ -67,7 +57,7 @@ - (void)splitViewController:(UISplitViewController *)splitController willShowViewController:(UIViewController *)viewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem { // Called when the view is shown again in the split view, invalidating the button and popover controller. - // [self.navigationItem setLeftBarButtonItem:nil animated:YES]; + [self.navigationItem setLeftBarButtonItem:nil animated:YES]; self.masterPopoverController = nil; } diff --git a/media/iphone/Resources-iPad/Classes/StoryDetailViewController~ipad.xib b/media/iphone/Resources-iPad/Classes/StoryDetailViewController~ipad.xib index 4831b9647..60116c734 100644 --- a/media/iphone/Resources-iPad/Classes/StoryDetailViewController~ipad.xib +++ b/media/iphone/Resources-iPad/Classes/StoryDetailViewController~ipad.xib @@ -39,14 +39,15 @@ - 292 + 256 YES 274 - {768, 960} + {768, 916} + 10 @@ -4459,14 +4460,16 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 290 {{356, 17}, {56, 11}} + NO IBIPadFramework 0.5 1 - {{0, 960}, {768, 44}} + {{0, 916}, {768, 44}} + 3 @@ -4524,8 +4527,9 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - {{0, 20}, {768, 1004}} + {{0, 64}, {768, 960}} + 3 @@ -4537,6 +4541,9 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 2 + + NO + IBIPadFramework @@ -4780,7 +4787,1117 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 71 - + + + YES + + AddSiteViewController + UIViewController + + YES + + YES + addFolder + addSite + checkSiteAddress + doAddButton + doCancelButton + selectAddTypeSignup + + + YES + id + id + id + id + id + id + + + + YES + + YES + addFolder + addSite + checkSiteAddress + doAddButton + doCancelButton + selectAddTypeSignup + + + YES + + addFolder + id + + + addSite + id + + + checkSiteAddress + id + + + doAddButton + id + + + doCancelButton + id + + + selectAddTypeSignup + id + + + + + YES + + YES + activityIndicator + addButton + addFolderInput + addTypeControl + addingLabel + appDelegate + cancelButton + errorLabel + folderPicker + inFolderInput + navBar + siteActivityIndicator + siteAddressInput + siteScrollView + siteTable + + + YES + UIActivityIndicatorView + UIBarButtonItem + UITextField + UISegmentedControl + UILabel + NewsBlurAppDelegate + UIBarButtonItem + UILabel + UIPickerView + UITextField + UINavigationBar + UIActivityIndicatorView + UITextField + UIScrollView + UITableView + + + + YES + + YES + activityIndicator + addButton + addFolderInput + addTypeControl + addingLabel + appDelegate + cancelButton + errorLabel + folderPicker + inFolderInput + navBar + siteActivityIndicator + siteAddressInput + siteScrollView + siteTable + + + YES + + activityIndicator + UIActivityIndicatorView + + + addButton + UIBarButtonItem + + + addFolderInput + UITextField + + + addTypeControl + UISegmentedControl + + + addingLabel + UILabel + + + appDelegate + NewsBlurAppDelegate + + + cancelButton + UIBarButtonItem + + + errorLabel + UILabel + + + folderPicker + UIPickerView + + + inFolderInput + UITextField + + + navBar + UINavigationBar + + + siteActivityIndicator + UIActivityIndicatorView + + + siteAddressInput + UITextField + + + siteScrollView + UIScrollView + + + siteTable + UITableView + + + + + IBProjectSource + ./Classes/AddSiteViewController.h + + + + BaseViewController + UIViewController + + IBProjectSource + ./Classes/BaseViewController.h + + + + DetailViewController + UIViewController + + IBProjectSource + ./Classes/DetailViewController.h + + + + FeedDetailViewController + BaseViewController + + YES + + YES + doOpenMarkReadActionSheet: + doOpenSettingsActionSheet + selectIntelligence + + + YES + id + id + id + + + + YES + + YES + doOpenMarkReadActionSheet: + doOpenSettingsActionSheet + selectIntelligence + + + YES + + doOpenMarkReadActionSheet: + id + + + doOpenSettingsActionSheet + id + + + selectIntelligence + id + + + + + YES + + YES + appDelegate + feedMarkReadButton + feedScoreSlider + feedViewToolbar + intelligenceControl + settingsButton + storyTitlesTable + + + YES + NewsBlurAppDelegate + UIBarButtonItem + UISlider + UIToolbar + UISegmentedControl + UIBarButtonItem + UITableView + + + + YES + + YES + appDelegate + feedMarkReadButton + feedScoreSlider + feedViewToolbar + intelligenceControl + settingsButton + storyTitlesTable + + + YES + + appDelegate + NewsBlurAppDelegate + + + feedMarkReadButton + UIBarButtonItem + + + feedScoreSlider + UISlider + + + feedViewToolbar + UIToolbar + + + intelligenceControl + UISegmentedControl + + + settingsButton + UIBarButtonItem + + + storyTitlesTable + UITableView + + + + + IBProjectSource + ./Classes/FeedDetailViewController.h + + + + LoginViewController + UIViewController + + selectLoginSignup + id + + + selectLoginSignup + + selectLoginSignup + id + + + + YES + + YES + activityIndicator + appDelegate + authenticatingLabel + emailInput + emailLabel + errorLabel + loginControl + passwordInput + passwordLabel + passwordOptionalLabel + usernameInput + usernameLabel + usernameOrEmailLabel + + + YES + UIActivityIndicatorView + NewsBlurAppDelegate + UILabel + UITextField + UILabel + UILabel + UISegmentedControl + UITextField + UILabel + UILabel + UITextField + UILabel + UILabel + + + + YES + + YES + activityIndicator + appDelegate + authenticatingLabel + emailInput + emailLabel + errorLabel + loginControl + passwordInput + passwordLabel + passwordOptionalLabel + usernameInput + usernameLabel + usernameOrEmailLabel + + + YES + + activityIndicator + UIActivityIndicatorView + + + appDelegate + NewsBlurAppDelegate + + + authenticatingLabel + UILabel + + + emailInput + UITextField + + + emailLabel + UILabel + + + errorLabel + UILabel + + + loginControl + UISegmentedControl + + + passwordInput + UITextField + + + passwordLabel + UILabel + + + passwordOptionalLabel + UILabel + + + usernameInput + UITextField + + + usernameLabel + UILabel + + + usernameOrEmailLabel + UILabel + + + + + IBProjectSource + ./Classes/LoginViewController.h + + + + MoveSiteViewController + UIViewController + + YES + + YES + doCancelButton + doMoveButton + moveFolder + moveSite + + + YES + id + id + id + id + + + + YES + + YES + doCancelButton + doMoveButton + moveFolder + moveSite + + + YES + + doCancelButton + id + + + doMoveButton + id + + + moveFolder + id + + + moveSite + id + + + + + YES + + YES + activityIndicator + appDelegate + cancelButton + errorLabel + folderPicker + fromFolderInput + moveButton + movingLabel + navBar + titleLabel + toFolderInput + + + YES + UIActivityIndicatorView + NewsBlurAppDelegate + UIBarButtonItem + UILabel + UIPickerView + UITextField + UIBarButtonItem + UILabel + UINavigationBar + UILabel + UITextField + + + + YES + + YES + activityIndicator + appDelegate + cancelButton + errorLabel + folderPicker + fromFolderInput + moveButton + movingLabel + navBar + titleLabel + toFolderInput + + + YES + + activityIndicator + UIActivityIndicatorView + + + appDelegate + NewsBlurAppDelegate + + + cancelButton + UIBarButtonItem + + + errorLabel + UILabel + + + folderPicker + UIPickerView + + + fromFolderInput + UITextField + + + moveButton + UIBarButtonItem + + + movingLabel + UILabel + + + navBar + UINavigationBar + + + titleLabel + UILabel + + + toFolderInput + UITextField + + + + + IBProjectSource + ./Classes/MoveSiteViewController.h + + + + NewsBlurAppDelegate + BaseViewController + + YES + + YES + addSiteViewController + detailViewController + feedDetailViewController + feedsViewController + loginViewController + moveSiteViewController + navigationController + originalStoryViewController + splitStoryController + splitStoryDetailNavigationController + storyDetailViewController + window + + + YES + AddSiteViewController + DetailViewController + FeedDetailViewController + NewsBlurViewController + LoginViewController + MoveSiteViewController + UINavigationController + OriginalStoryViewController + UISplitViewController + UINavigationController + StoryDetailViewController + UIWindow + + + + YES + + YES + addSiteViewController + detailViewController + feedDetailViewController + feedsViewController + loginViewController + moveSiteViewController + navigationController + originalStoryViewController + splitStoryController + splitStoryDetailNavigationController + storyDetailViewController + window + + + YES + + addSiteViewController + AddSiteViewController + + + detailViewController + DetailViewController + + + feedDetailViewController + FeedDetailViewController + + + feedsViewController + NewsBlurViewController + + + loginViewController + LoginViewController + + + moveSiteViewController + MoveSiteViewController + + + navigationController + UINavigationController + + + originalStoryViewController + OriginalStoryViewController + + + splitStoryController + UISplitViewController + + + splitStoryDetailNavigationController + UINavigationController + + + storyDetailViewController + StoryDetailViewController + + + window + UIWindow + + + + + IBProjectSource + ./Classes/NewsBlurAppDelegate.h + + + + NewsBlurViewController + BaseViewController + + YES + + YES + doAddButton + doLogoutButton + doSwitchSitesUnread + sectionTapped: + sectionUntapped: + selectIntelligence + + + YES + id + id + id + UIButton + UIButton + id + + + + YES + + YES + doAddButton + doLogoutButton + doSwitchSitesUnread + sectionTapped: + sectionUntapped: + selectIntelligence + + + YES + + doAddButton + id + + + doLogoutButton + id + + + doSwitchSitesUnread + id + + + sectionTapped: + UIButton + + + sectionUntapped: + UIButton + + + selectIntelligence + id + + + + + YES + + YES + addButton + appDelegate + feedScoreSlider + feedTitlesTable + feedViewToolbar + intelligenceControl + logoutButton + sitesButton + + + YES + UIBarButtonItem + NewsBlurAppDelegate + UISlider + UITableView + UIToolbar + UISegmentedControl + UIBarButtonItem + UIBarButtonItem + + + + YES + + YES + addButton + appDelegate + feedScoreSlider + feedTitlesTable + feedViewToolbar + intelligenceControl + logoutButton + sitesButton + + + YES + + addButton + UIBarButtonItem + + + appDelegate + NewsBlurAppDelegate + + + feedScoreSlider + UISlider + + + feedTitlesTable + UITableView + + + feedViewToolbar + UIToolbar + + + intelligenceControl + UISegmentedControl + + + logoutButton + UIBarButtonItem + + + sitesButton + UIBarButtonItem + + + + + IBProjectSource + ./Classes/NewsBlurViewController.h + + + + OriginalStoryViewController + BaseViewController + + YES + + YES + doCloseOriginalStoryViewController + doOpenActionSheet + loadAddress: + + + YES + id + id + id + + + + YES + + YES + doCloseOriginalStoryViewController + doOpenActionSheet + loadAddress: + + + YES + + doCloseOriginalStoryViewController + id + + + doOpenActionSheet + id + + + loadAddress: + id + + + + + YES + + YES + appDelegate + back + closeButton + forward + pageAction + pageTitle + pageUrl + refresh + toolbar + webView + + + YES + NewsBlurAppDelegate + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UILabel + UITextField + UIBarButtonItem + UIToolbar + UIWebView + + + + YES + + YES + appDelegate + back + closeButton + forward + pageAction + pageTitle + pageUrl + refresh + toolbar + webView + + + YES + + appDelegate + NewsBlurAppDelegate + + + back + UIBarButtonItem + + + closeButton + UIBarButtonItem + + + forward + UIBarButtonItem + + + pageAction + UIBarButtonItem + + + pageTitle + UILabel + + + pageUrl + UITextField + + + refresh + UIBarButtonItem + + + toolbar + UIToolbar + + + webView + UIWebView + + + + + IBProjectSource + ./Classes/OriginalStoryViewController.h + + + + StoryDetailViewController + UIViewController + + YES + + YES + doNextUnreadStory + doPreviousStory + + + YES + id + id + + + + YES + + YES + doNextUnreadStory + doPreviousStory + + + YES + + doNextUnreadStory + id + + + doPreviousStory + id + + + + + YES + + YES + activity + appDelegate + buttonAction + buttonNext + buttonPrevious + feedTitleGradient + progressView + toolbar + webView + + + YES + UIBarButtonItem + NewsBlurAppDelegate + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIView + UIProgressView + UIToolbar + UIWebView + + + + YES + + YES + activity + appDelegate + buttonAction + buttonNext + buttonPrevious + feedTitleGradient + progressView + toolbar + webView + + + YES + + activity + UIBarButtonItem + + + appDelegate + NewsBlurAppDelegate + + + buttonAction + UIBarButtonItem + + + buttonNext + UIBarButtonItem + + + buttonPrevious + UIBarButtonItem + + + feedTitleGradient + UIView + + + progressView + UIProgressView + + + toolbar + UIToolbar + + + webView + UIWebView + + + + + IBProjectSource + ./Classes/StoryDetailViewController.h + + + + 0 IBIPadFramework diff --git a/media/iphone/Resources-iPad/MainWindow~ipad.xib b/media/iphone/Resources-iPad/MainWindow~ipad.xib index 5f35e7ba5..fce04202a 100644 --- a/media/iphone/Resources-iPad/MainWindow~ipad.xib +++ b/media/iphone/Resources-iPad/MainWindow~ipad.xib @@ -121,12 +121,9 @@ NO - + 292 {768, 1024} - - - 1 MSAxIDEAA @@ -137,6 +134,17 @@ IBIPadFramework YES + + + 2 + + + 1 + 1 + + IBIPadFramework + NO + YES @@ -276,22 +284,6 @@ 127 - - - navigationController - - - - 45 - - - - detailViewController - - - - 142 - splitStoryController @@ -300,6 +292,30 @@ 143 + + + navigationController + + + + 144 + + + + splitStoryDetailNavigationController + + + + 145 + + + + detailViewController + + + + 148 + appDelegate @@ -356,6 +372,14 @@ 125 + + + appDelegate + + + + 149 + @@ -473,6 +497,11 @@ + + 146 + + + @@ -503,6 +532,8 @@ 135.IBPluginDependency 136.CustomClassName 136.IBPluginDependency + 146.CustomClassName + 146.IBPluginDependency 3.CustomClassName 3.IBPluginDependency 39.IBLastUsedUIStatusBarStylesToTargetRuntimesMap @@ -560,6 +591,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UINavigationController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin DetailViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin NewsBlurAppDelegate @@ -599,7 +632,7 @@ - 143 + 149 @@ -806,6 +839,17 @@ DetailViewController UIViewController + + appDelegate + NewsBlurAppDelegate + + + appDelegate + + appDelegate + NewsBlurAppDelegate + + IBProjectSource ./Classes/DetailViewController.h @@ -1218,6 +1262,7 @@ navigationController originalStoryViewController splitStoryController + splitStoryDetailNavigationController storyDetailViewController window @@ -1232,6 +1277,7 @@ UINavigationController OriginalStoryViewController UISplitViewController + UINavigationController StoryDetailViewController UIWindow @@ -1249,6 +1295,7 @@ navigationController originalStoryViewController splitStoryController + splitStoryDetailNavigationController storyDetailViewController window @@ -1290,6 +1337,10 @@ splitStoryController UISplitViewController + + splitStoryDetailNavigationController + UINavigationController + storyDetailViewController StoryDetailViewController