adding in the master container and rotation logic

2025-09-18 21:43:31 +00:00 · 2012-07-24 11:44:16 -07:00 · 2012-07-24 11:44:16 -07:00 · f05acc0229
commit f05acc0229
parent 52f5c20a72
10 changed files with 262 additions and 41 deletions
--- a/media/ios/Classes/ActivityCell.m
+++ b/media/ios/Classes/ActivityCell.m
@ -88,7 +88,6 @@
        NSString *faviconUrl = [NSString stringWithFormat:@"http://%@/rss_feeds/icon/%i", 
                                NEWSBLUR_URL,
                                [[activity objectForKey:@"feed_id"] intValue]];
-        NSLog(@"faviconUrl is %@", faviconUrl);
        [self.faviconView setImageWithURL:[NSURL URLWithString:faviconUrl ]
                         placeholderImage:placeholder];
        self.faviconView.contentMode = UIViewContentModeScaleAspectFit;
--- a/media/ios/Classes/NBContainerViewController.h
+++ b/media/ios/Classes/NBContainerViewController.h
@ -0,0 +1,21 @@
+//
+//  NBContainerViewController.h
+//  NewsBlur
+//
+//  Created by Roy Yang on 7/24/12.
+//  Copyright (c) 2012 NewsBlur. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class NewsBlurAppDelegate;
+
+@interface NBContainerViewController : UIViewController {
+    NewsBlurAppDelegate *appDelegate;
+}
+
+@property (atomic, strong) IBOutlet NewsBlurAppDelegate *appDelegate;
+
+- (void)adjustDashboardFrame;
+- (void)transitionToFeedDetail;
+@end
--- a/media/ios/Classes/NBContainerViewController.m
+++ b/media/ios/Classes/NBContainerViewController.m
@ -0,0 +1,108 @@
+//
+//  NBContainerViewController.m
+//  NewsBlur
+//
+//  Created by Roy Yang on 7/24/12.
+//  Copyright (c) 2012 NewsBlur. All rights reserved.
+//
+
+#import "NBContainerViewController.h"
+#import "NewsBlurViewController.h"
+#import "FeedDetailViewController.h"
+#import "DashboardViewController.h"
+#import "StoryDetailViewController.h"
+#import "ShareViewController.h"
+
+#define NB_DEFAULT_MASTER_WIDTH 270
+
+@interface NBContainerViewController ()
+
+@property (nonatomic, strong) UINavigationController *masterNavigationController;
+@property (nonatomic, strong) NewsBlurViewController *feedsViewController;
+@property (nonatomic, strong) FeedDetailViewController *feedDetailViewController;
+@property (nonatomic, strong) DashboardViewController *dashboardViewController;
+@property (nonatomic, strong) StoryDetailViewController *storyDetailViewController;
+@property (nonatomic, strong) ShareViewController *shareViewController;
+
+@end
+
+@implementation NBContainerViewController
+
+@synthesize appDelegate;
+@synthesize masterNavigationController;
+@synthesize feedsViewController;
+@synthesize feedDetailViewController;
+@synthesize dashboardViewController;
+@synthesize storyDetailViewController;
+@synthesize shareViewController;
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+        
+
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+	// Do any additional setup after loading the view.
+    self.view.backgroundColor = [UIColor blackColor]; 
+    
+    self.masterNavigationController = appDelegate.navigationController;
+    self.feedsViewController = appDelegate.feedsViewController;
+    self.dashboardViewController = appDelegate.dashboardViewController;
+    
+    // adding master navigation controller
+    [self addChildViewController:self.masterNavigationController];
+    [self.view addSubview:self.masterNavigationController.view];
+    [self.masterNavigationController didMoveToParentViewController:self];
+    
+    // adding dashboardViewController 
+    [self addChildViewController:self.dashboardViewController];
+    [self.view addSubview:self.dashboardViewController.view];
+    [self.dashboardViewController didMoveToParentViewController:self];
+}
+
+- (void)viewWillLayoutSubviews {
+    [self adjustDashboardFrame];
+}
+
+- (void)viewDidUnload {
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	return YES;
+}
+
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+    [self adjustDashboardFrame];
+}
+
+# pragma mark Screen Transitions and Layout
+
+- (void)adjustDashboardFrame {
+    CGRect vb = [self.view bounds];
+    self.masterNavigationController.view.frame = CGRectMake(0, 0, NB_DEFAULT_MASTER_WIDTH, vb.size.height);
+    self.dashboardViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH + 1, 0, vb.size.width - NB_DEFAULT_MASTER_WIDTH - 1, vb.size.height);
+}
+
+- (void)transitionToFeedDetail {
+    UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
+	if (UIInterfaceOrientationIsPortrait(orientation)) {
+        
+    }
+    
+}
+
+@end
--- a/media/ios/Classes/NewsBlurAppDelegate.h
+++ b/media/ios/Classes/NewsBlurAppDelegate.h
@ -38,6 +38,7 @@
@class OriginalStoryViewController;
@class MGSplitViewController;
@class UserProfileViewController;
+@class NBContainerViewController;


@interface NewsBlurAppDelegate : BaseViewController <UIApplicationDelegate, UIAlertViewDelegate>  {
@ -47,6 +48,7 @@
    UINavigationController *navigationController;
    UINavigationController *splitStoryDetailNavigationController;
    UINavigationController *findFriendsNavigationController;
+    NBContainerViewController *masterContainerViewController;

    FirstTimeUserViewController *firstTimeUserViewController;
    FirstTimeUserAddSitesViewController *firstTimeUserAddSitesViewController;
@ -118,6 +120,7 @@
@property (nonatomic, readonly) IBOutlet UINavigationController *navigationController;
@property (nonatomic, readonly) IBOutlet UINavigationController *findFriendsNavigationController;
@property (nonatomic, readonly) IBOutlet UINavigationController *splitStoryDetailNavigationController;
+@property (nonatomic) IBOutlet NBContainerViewController *masterContainerViewController;
@property (nonatomic) IBOutlet DashboardViewController *dashboardViewController;
@property (nonatomic) IBOutlet NewsBlurViewController *feedsViewController;
@property (nonatomic) IBOutlet FeedsMenuViewController *feedsMenuViewController;
--- a/media/ios/Classes/NewsBlurAppDelegate.m
+++ b/media/ios/Classes/NewsBlurAppDelegate.m
@ -8,6 +8,7 @@

 #import "NewsBlurAppDelegate.h"
 #import "NewsBlurViewController.h"
+#import "NBContainerViewController.h"
 #import "FeedDetailViewController.h"
 #import "DashboardViewController.h"
 #import "FeedDashboardViewController.h"
@ -38,6 +39,7 @@
@synthesize navigationController;
@synthesize findFriendsNavigationController;
@synthesize splitStoryDetailNavigationController;
+@synthesize masterContainerViewController;
@synthesize googleReaderViewController;
@synthesize dashboardViewController;
@synthesize feedsViewController;
@ -122,8 +124,8 @@
        self.splitStoryDetailNavigationController.viewControllers = [NSArray arrayWithObject:self.dashboardViewController];
        self.splitStoryController.viewControllers = [NSArray arrayWithObjects:navigationController, splitStoryDetailNavigationController, nil];
        
-        [window addSubview:self.splitStoryController.view];
-        self.window.rootViewController = self.splitStoryController;
+        [window addSubview:self.masterContainerViewController.view];
+        self.window.rootViewController = self.masterContainerViewController;
    } else {
        self.navigationController.viewControllers = [NSArray arrayWithObject:self.feedsViewController];
        [window addSubview:self.navigationController.view];
@ -435,18 +437,19 @@
    [feedDetailViewController fetchFeedDetail:1 withCallback:nil];
    
    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-        if ([[self.splitStoryDetailNavigationController viewControllers] containsObject:self.feedDashboardViewController]) {
-            //[self.storyDetailViewController initStory];
-        } else {
-            if (self.inFindingStoryMode) {
-                [self showFindingStoryHUD];
-                [self.splitStoryDetailNavigationController pushViewController:self.feedDashboardViewController animated:NO];
-            } else {
-                [self.splitStoryDetailNavigationController pushViewController:self.feedDashboardViewController animated:YES];
-                [self showNoSelectedStoryLabel];
-            }
-
-        }
+        [self.masterContainerViewController transitionToFeedDetail];
+//        if ([[self.splitStoryDetailNavigationController viewControllers] containsObject:self.feedDashboardViewController]) {
+//            //[self.storyDetailViewController initStory];
+//        } else {
+//            if (self.inFindingStoryMode) {
+//                [self showFindingStoryHUD];
+//                [self.splitStoryDetailNavigationController pushViewController:self.feedDashboardViewController animated:NO];
+//            } else {
+//                [self.splitStoryDetailNavigationController pushViewController:self.feedDashboardViewController animated:YES];
+//                [self showNoSelectedStoryLabel];
+//            }
+//
+//        }
    }
 }

--- a/media/ios/Classes/SmallActivityCell.m
+++ b/media/ios/Classes/SmallActivityCell.m
@ -82,7 +82,6 @@
        NSString *faviconUrl = [NSString stringWithFormat:@"http://%@/rss_feeds/icon/%i", 
                                NEWSBLUR_URL,
                                [[activity objectForKey:@"feed_id"] intValue]];
-        NSLog(@"faviconUrl is %@", faviconUrl);
        [self.faviconView setImageWithURL:[NSURL URLWithString:faviconUrl ]
                         placeholderImage:placeholder];
        self.faviconView.contentMode = UIViewContentModeScaleAspectFit;
--- a/media/ios/NewsBlur.xcodeproj/project.pbxproj
+++ b/media/ios/NewsBlur.xcodeproj/project.pbxproj
@ -35,6 +35,7 @@
 		433D24851582EEC800AE9E72 /* NewsBlurViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43D045201565BC150085F811 /* NewsBlurViewController~ipad.xib */; };
 		433D24861582EECA00AE9E72 /* OriginalStoryViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43D045251565BC150085F811 /* OriginalStoryViewController~ipad.xib */; };
 		433D24871582EECD00AE9E72 /* StoryDetailViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43D045221565BC150085F811 /* StoryDetailViewController~ipad.xib */; };
+		436ACA8D15BF1088004E01CC /* NBContainerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 436ACA8C15BF1088004E01CC /* NBContainerViewController.m */; };
 		43763AD1158F90B100B3DBE2 /* FontSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 43763ACF158F90B100B3DBE2 /* FontSettingsViewController.m */; };
 		43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43763AD0158F90B100B3DBE2 /* FontSettingsViewController.xib */; };
 		437AA8AD15922D13005463F5 /* FeedDashboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437AA8AB15922D13005463F5 /* FeedDashboardViewController.m */; };
@ -331,6 +332,8 @@
 		433323CA158968ED0025064D /* FirstTimeUserViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FirstTimeUserViewController.h; sourceTree = "<group>"; };
 		433323CB158968ED0025064D /* FirstTimeUserViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FirstTimeUserViewController.m; sourceTree = "<group>"; };
 		433323CC158968ED0025064D /* FirstTimeUserViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FirstTimeUserViewController.xib; sourceTree = "<group>"; };
+		436ACA8B15BF1088004E01CC /* NBContainerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NBContainerViewController.h; sourceTree = "<group>"; };
+		436ACA8C15BF1088004E01CC /* NBContainerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NBContainerViewController.m; sourceTree = "<group>"; };
 		43763ACE158F90B100B3DBE2 /* FontSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSettingsViewController.h; sourceTree = "<group>"; };
 		43763ACF158F90B100B3DBE2 /* FontSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FontSettingsViewController.m; sourceTree = "<group>"; };
 		43763AD0158F90B100B3DBE2 /* FontSettingsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = FontSettingsViewController.xib; path = Classes/FontSettingsViewController.xib; sourceTree = "<group>"; };
@ -789,6 +792,8 @@
 				FFE5322E144C8AC300ACFDE0 /* Utilities.m */,
 				43D818A115B940C200733444 /* DataUtilities.h */,
 				43D818A215B940C200733444 /* DataUtilities.m */,
+				436ACA8B15BF1088004E01CC /* NBContainerViewController.h */,
+				436ACA8C15BF1088004E01CC /* NBContainerViewController.m */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@ -1963,6 +1968,7 @@
 				43E8382015BC73EB000553BE /* FirstTimeUserAddNewsBlurViewController.m in Sources */,
 				43E8382215BC73EB000553BE /* FirstTimeUserAddSitesViewController.m in Sources */,
 				43DACC3F15BDE47F004A938B /* StoryDetailContainerViewController.m in Sources */,
+				436ACA8D15BF1088004E01CC /* NBContainerViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/media/ios/NewsBlur_Prefix.pch
+++ b/media/ios/NewsBlur_Prefix.pch
@ -15,8 +15,8 @@
 //    #define BACKGROUND_REFRESH_SECONDS -5
    #define BACKGROUND_REFRESH_SECONDS -10*60

-    #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host"]
-//    #define NEWSBLUR_URL [NSString stringWithFormat:@"dev.newsblur.com"]
+//    #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host"]
+    #define NEWSBLUR_URL [NSString stringWithFormat:@"dev.newsblur.com"]

    #define NEWSBLUR_ORANGE 0xAE5D15

--- a/Sources/MGSplitViewController.m
+++ b/Sources/MGSplitViewController.m
@ -10,7 +10,7 @@
 #import "MGSplitDividerView.h"
 #import "MGSplitCornersView.h"

-#define MG_DEFAULT_SPLIT_POSITION		270.0	// default width of master view in UISplitViewController.
+#define MG_DEFAULT_SPLIT_POSITION		400.0	// default width of master view in UISplitViewController.
 #define MG_DEFAULT_SPLIT_WIDTH			1.0		// default width of split-gutter in UISplitViewController.
 #define MG_DEFAULT_CORNER_RADIUS		5.0		// default corner-radius of overlapping split-inner corners on the master and detail views.
 #define MG_DEFAULT_CORNER_COLOR			[UIColor blackColor]	// default color of intruding inner corners (and divider background).
--- a/media/ios/Resources-iPad/MainWindow~ipad.xib
+++ b/media/ios/Resources-iPad/MainWindow~ipad.xib
@ -290,6 +290,17 @@
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
+			<object class="IBUIViewController" id="375827920">
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
+					<int key="IBUIStatusBarStyle">2</int>
+				</object>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+			</object>
 			<object class="IBUIViewController" id="862039655">
 				<object class="NSArray" key="IBUIToolbarItems" id="0">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@ -302,6 +313,7 @@
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
 			<object class="IBUINavigationController" id="763276607">
+				<string key="IBUITitle">FindFriends</string>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
 					<int key="IBUIStatusBarStyle">2</int>
 				</object>
@ -325,6 +337,7 @@
 				</object>
 			</object>
 			<object class="IBUINavigationController" id="396985587">
+				<string key="IBUITitle">Main</string>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
 					<int key="IBUIStatusBarStyle">2</int>
 				</object>
@ -347,6 +360,7 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBUIViewController" id="813520712">
 						<object class="IBUINavigationItem" key="IBUINavigationItem" id="165811166">
+							<reference key="IBUINavigationBar"/>
 							<string key="IBUITitle">Title</string>
 							<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 						</object>
@ -576,6 +590,14 @@
 					</object>
 					<int key="connectionID">261</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">masterContainerViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="375827920"/>
+					</object>
+					<int key="connectionID">266</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">appDelegate</string>
@ -688,14 +710,6 @@
 					</object>
 					<int key="connectionID">193</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">masterViewController</string>
-						<reference key="source" ref="402833749"/>
-						<reference key="destination" ref="396985587"/>
-					</object>
-					<int key="connectionID">189</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">appDelegate</string>
@ -752,6 +766,14 @@
 					</object>
 					<int key="connectionID">262</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">appDelegate</string>
+						<reference key="source" ref="375827920"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">267</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@ -943,6 +965,11 @@
 						<reference key="object" ref="688107379"/>
 						<reference key="parent" ref="0"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">264</int>
+						<reference key="object" ref="375827920"/>
+						<reference key="parent" ref="0"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@ -1008,6 +1035,8 @@
 					<string>253.IBPluginDependency</string>
 					<string>260.CustomClassName</string>
 					<string>260.IBPluginDependency</string>
+					<string>264.CustomClassName</string>
+					<string>264.IBPluginDependency</string>
 					<string>3.CustomClassName</string>
 					<string>3.IBPluginDependency</string>
 					<string>51.CustomClassName</string>
@ -1099,6 +1128,8 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>StoryDetailContainerViewController</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>NBContainerViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>NewsBlurAppDelegate</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>FeedDetailViewController</string>
@ -1127,7 +1158,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">262</int>
+			<int key="maxID">267</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -2802,6 +2833,25 @@
 						<string key="minorKey">./Classes/MoveSiteViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NBContainerViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">appDelegate</string>
+						<string key="NS.object.0">NewsBlurAppDelegate</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">appDelegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">appDelegate</string>
+							<string key="candidateClassName">NewsBlurAppDelegate</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NBContainerViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NewsBlurAppDelegate</string>
 					<string key="superclassName">BaseViewController</string>
@ -2825,6 +2875,7 @@
 							<string>ftuxNavigationController</string>
 							<string>googleReaderViewController</string>
 							<string>loginViewController</string>
+							<string>masterContainerViewController</string>
 							<string>moveSiteViewController</string>
 							<string>navigationController</string>
 							<string>originalStoryViewController</string>
@ -2854,6 +2905,7 @@
 							<string>UINavigationController</string>
 							<string>GoogleReaderViewController</string>
 							<string>LoginViewController</string>
+							<string>NBContainerViewController</string>
 							<string>MoveSiteViewController</string>
 							<string>UINavigationController</string>
 							<string>OriginalStoryViewController</string>
@ -2886,6 +2938,7 @@
 							<string>ftuxNavigationController</string>
 							<string>googleReaderViewController</string>
 							<string>loginViewController</string>
+							<string>masterContainerViewController</string>
 							<string>moveSiteViewController</string>
 							<string>navigationController</string>
 							<string>originalStoryViewController</string>
@ -2963,6 +3016,10 @@
 								<string key="name">loginViewController</string>
 								<string key="candidateClassName">LoginViewController</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">masterContainerViewController</string>
+								<string key="candidateClassName">NBContainerViewController</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">moveSiteViewController</string>
 								<string key="candidateClassName">MoveSiteViewController</string>
@ -3390,15 +3447,47 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">StoryDetailContainerViewController</string>
 					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">toggleFontSize:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">toggleFontSize:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">toggleFontSize:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">appDelegate</string>
-						<string key="NS.object.0">NewsBlurAppDelegate</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>toggleViewButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>UIBarButtonItem</string>
+						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">appDelegate</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">appDelegate</string>
-							<string key="candidateClassName">NewsBlurAppDelegate</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>toggleViewButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">appDelegate</string>
+								<string key="candidateClassName">NewsBlurAppDelegate</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">toggleViewButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -3468,7 +3557,6 @@
 							<string>feedTitleGradient</string>
 							<string>innerView</string>
 							<string>progressView</string>
-							<string>toggleViewButton</string>
 							<string>toolbar</string>
 							<string>webView</string>
 						</object>
@ -3483,7 +3571,6 @@
 							<string>UIView</string>
 							<string>UIView</string>
 							<string>UIProgressView</string>
-							<string>UIBarButtonItem</string>
 							<string>UIToolbar</string>
 							<string>UIWebView</string>
 						</object>
@ -3501,7 +3588,6 @@
 							<string>feedTitleGradient</string>
 							<string>innerView</string>
 							<string>progressView</string>
-							<string>toggleViewButton</string>
 							<string>toolbar</string>
 							<string>webView</string>
 						</object>
@ -3543,10 +3629,6 @@
 								<string key="name">progressView</string>
 								<string key="candidateClassName">UIProgressView</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">toggleViewButton</string>
-								<string key="candidateClassName">UIBarButtonItem</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">toolbar</string>
 								<string key="candidateClassName">UIToolbar</string>