adding in animation for feed detail screen

This commit is contained in:
Roy Yang 2012-07-24 15:29:01 -07:00
parent f05acc0229
commit 9febdaff93
8 changed files with 1142 additions and 103 deletions

View file

@ -36,12 +36,12 @@
</object>
<object class="IBUIView" id="766721923">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="IBUIView" id="421309746">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{478, 916}</string>
<string key="NSFrame">{{0, 44}, {478, 872}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="367719820"/>
@ -58,7 +58,7 @@
<object class="IBUIView" id="367719820">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{478, 916}</string>
<string key="NSFrame">{{0, 44}, {478, 872}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="930645221"/>
@ -73,7 +73,7 @@
<object class="IBUIWebView" id="930645221">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{478, 916}</string>
<string key="NSFrame">{{0, 44}, {478, 872}}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="166456364"/>
@ -156,11 +156,24 @@
</object>
</array>
</object>
<object class="IBUIToolbar" id="823249753">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{478, 44}</string>
<reference key="NSSuperview" ref="766721923"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="421309746"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<array class="NSMutableArray" key="IBUIItems"/>
</object>
</array>
<string key="NSFrameSize">{478, 960}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="421309746"/>
<reference key="NSNextKeyView" ref="823249753"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
@ -260,6 +273,7 @@
<reference ref="367719820"/>
<reference ref="421309746"/>
<reference ref="930645221"/>
<reference ref="823249753"/>
</array>
<reference key="parent" ref="0"/>
</object>
@ -312,6 +326,12 @@
<reference key="object" ref="930645221"/>
<reference key="parent" ref="766721923"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">51</int>
<reference key="object" ref="823249753"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="766721923"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -331,12 +351,13 @@
<string key="38.CustomClassName">ActivityModule</string>
<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="51.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">50</int>
<int key="maxID">52</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -660,7 +681,7 @@
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserViewController</string>
<string key="className">FirstTimeUserAddFriendsViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="tapCategoryButton:">id</string>
@ -694,6 +715,7 @@
<string key="googleReaderButton">UIButton</string>
<string key="logo">UIImageView</string>
<string key="nextButton">UIBarButtonItem</string>
<string key="previousButton">UIBarButtonItem</string>
<string key="toolbar">UIToolbar</string>
<string key="toolbarTitle">UIButton</string>
<string key="welcomeView">UIView</string>
@ -727,6 +749,10 @@
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="previousButton">
<string key="name">previousButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="toolbar">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
@ -740,6 +766,226 @@
<string key="candidateClassName">UIView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FirstTimeUserAddFriendsViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserAddNewsBlurViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="tapCategoryButton:">id</string>
<string key="tapGoogleReaderButton">id</string>
<string key="tapNewsBlurButton:">id</string>
<string key="tapNextButton">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="tapCategoryButton:">
<string key="name">tapCategoryButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="tapGoogleReaderButton">
<string key="name">tapGoogleReaderButton</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="tapNewsBlurButton:">
<string key="name">tapNewsBlurButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="tapNextButton">
<string key="name">tapNextButton</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="addFriendsView">UIView</string>
<string key="addNewsBlurView">UIView</string>
<string key="addSitesView">UIView</string>
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="googleReaderButton">UIButton</string>
<string key="logo">UIImageView</string>
<string key="nextButton">UIBarButtonItem</string>
<string key="previousButton">UIBarButtonItem</string>
<string key="toolbar">UIToolbar</string>
<string key="toolbarTitle">UIButton</string>
<string key="welcomeView">UIView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="addFriendsView">
<string key="name">addFriendsView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="addNewsBlurView">
<string key="name">addNewsBlurView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="addSitesView">
<string key="name">addSitesView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="googleReaderButton">
<string key="name">googleReaderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="logo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="nextButton">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="previousButton">
<string key="name">previousButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="toolbar">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo" key="toolbarTitle">
<string key="name">toolbarTitle</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="welcomeView">
<string key="name">welcomeView</string>
<string key="candidateClassName">UIView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FirstTimeUserAddNewsBlurViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserAddSitesViewController</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="tapCategoryButton:">id</string>
<string key="tapGoogleReaderButton">id</string>
<string key="tapNewsBlurButton:">id</string>
<string key="tapNextButton">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="tapCategoryButton:">
<string key="name">tapCategoryButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="tapGoogleReaderButton">
<string key="name">tapGoogleReaderButton</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="tapNewsBlurButton:">
<string key="name">tapNewsBlurButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="tapNextButton">
<string key="name">tapNextButton</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="addFriendsView">UIView</string>
<string key="addNewsBlurView">UIView</string>
<string key="addSitesView">UIView</string>
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="googleReaderButton">UIButton</string>
<string key="logo">UIImageView</string>
<string key="nextButton">UIBarButtonItem</string>
<string key="previousButton">UIBarButtonItem</string>
<string key="toolbar">UIToolbar</string>
<string key="toolbarTitle">UIButton</string>
<string key="welcomeView">UIView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="addFriendsView">
<string key="name">addFriendsView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="addNewsBlurView">
<string key="name">addNewsBlurView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="addSitesView">
<string key="name">addSitesView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="googleReaderButton">
<string key="name">googleReaderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="logo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="nextButton">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="previousButton">
<string key="name">previousButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="toolbar">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo" key="toolbarTitle">
<string key="name">toolbarTitle</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="welcomeView">
<string key="name">welcomeView</string>
<string key="candidateClassName">UIView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FirstTimeUserAddSitesViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">tapNextButton</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">tapNextButton</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">tapNextButton</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="logo">UIImageView</string>
<string key="nextButton">UIBarButtonItem</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="logo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="nextButton">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FirstTimeUserViewController.h</string>
@ -1137,6 +1383,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>
@ -1148,17 +1413,23 @@
<string key="feedsMenuViewController">FeedsMenuViewController</string>
<string key="feedsViewController">NewsBlurViewController</string>
<string key="findFriendsNavigationController">UINavigationController</string>
<string key="firstTimeUserAddFriendsViewController">FirstTimeUserAddFriendsViewController</string>
<string key="firstTimeUserAddNewsBlurViewController">FirstTimeUserAddNewsBlurViewController</string>
<string key="firstTimeUserAddSitesViewController">FirstTimeUserAddSitesViewController</string>
<string key="firstTimeUserViewController">FirstTimeUserViewController</string>
<string key="fontSettingsViewController">FontSettingsViewController</string>
<string key="friendsListViewController">FriendsListViewController</string>
<string key="ftuxNavigationController">UINavigationController</string>
<string key="googleReaderViewController">GoogleReaderViewController</string>
<string key="loginViewController">LoginViewController</string>
<string key="masterContainerViewController">NBContainerViewController</string>
<string key="moveSiteViewController">MoveSiteViewController</string>
<string key="navigationController">UINavigationController</string>
<string key="originalStoryViewController">OriginalStoryViewController</string>
<string key="shareViewController">ShareViewController</string>
<string key="splitStoryController">MGSplitViewController</string>
<string key="splitStoryDetailNavigationController">UINavigationController</string>
<string key="storyDetailContainerViewController">StoryDetailContainerViewController</string>
<string key="storyDetailViewController">StoryDetailViewController</string>
<string key="userProfileViewController">UserProfileViewController</string>
<string key="window">UIWindow</string>
@ -1192,6 +1463,18 @@
<string key="name">findFriendsNavigationController</string>
<string key="candidateClassName">UINavigationController</string>
</object>
<object class="IBToOneOutletInfo" key="firstTimeUserAddFriendsViewController">
<string key="name">firstTimeUserAddFriendsViewController</string>
<string key="candidateClassName">FirstTimeUserAddFriendsViewController</string>
</object>
<object class="IBToOneOutletInfo" key="firstTimeUserAddNewsBlurViewController">
<string key="name">firstTimeUserAddNewsBlurViewController</string>
<string key="candidateClassName">FirstTimeUserAddNewsBlurViewController</string>
</object>
<object class="IBToOneOutletInfo" key="firstTimeUserAddSitesViewController">
<string key="name">firstTimeUserAddSitesViewController</string>
<string key="candidateClassName">FirstTimeUserAddSitesViewController</string>
</object>
<object class="IBToOneOutletInfo" key="firstTimeUserViewController">
<string key="name">firstTimeUserViewController</string>
<string key="candidateClassName">FirstTimeUserViewController</string>
@ -1204,6 +1487,10 @@
<string key="name">friendsListViewController</string>
<string key="candidateClassName">FriendsListViewController</string>
</object>
<object class="IBToOneOutletInfo" key="ftuxNavigationController">
<string key="name">ftuxNavigationController</string>
<string key="candidateClassName">UINavigationController</string>
</object>
<object class="IBToOneOutletInfo" key="googleReaderViewController">
<string key="name">googleReaderViewController</string>
<string key="candidateClassName">GoogleReaderViewController</string>
@ -1212,6 +1499,10 @@
<string key="name">loginViewController</string>
<string key="candidateClassName">LoginViewController</string>
</object>
<object class="IBToOneOutletInfo" key="masterContainerViewController">
<string key="name">masterContainerViewController</string>
<string key="candidateClassName">NBContainerViewController</string>
</object>
<object class="IBToOneOutletInfo" key="moveSiteViewController">
<string key="name">moveSiteViewController</string>
<string key="candidateClassName">MoveSiteViewController</string>
@ -1236,6 +1527,10 @@
<string key="name">splitStoryDetailNavigationController</string>
<string key="candidateClassName">UINavigationController</string>
</object>
<object class="IBToOneOutletInfo" key="storyDetailContainerViewController">
<string key="name">storyDetailContainerViewController</string>
<string key="candidateClassName">StoryDetailContainerViewController</string>
</object>
<object class="IBToOneOutletInfo" key="storyDetailViewController">
<string key="name">storyDetailViewController</string>
<string key="candidateClassName">StoryDetailViewController</string>
@ -1477,6 +1772,39 @@
<string key="minorKey">./Classes/ShareViewController.h</string>
</object>
</object>
<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>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="appDelegate">NewsBlurAppDelegate</string>
<string key="toggleViewButton">UIBarButtonItem</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="appDelegate">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo" key="toggleViewButton">
<string key="name">toggleViewButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/StoryDetailContainerViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">StoryDetailViewController</string>
<string key="superclassName">UIViewController</string>
@ -1514,8 +1842,8 @@
<string key="feedTitleGradient">UIView</string>
<string key="innerView">UIView</string>
<string key="progressView">UIProgressView</string>
<string key="toggleViewButton">UIBarButtonItem</string>
<string key="toolbar">UIToolbar</string>
<string key="topToolbar">UIToolbar</string>
<string key="webView">UIWebView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@ -1555,14 +1883,14 @@
<string key="name">progressView</string>
<string key="candidateClassName">UIProgressView</string>
</object>
<object class="IBToOneOutletInfo" key="toggleViewButton">
<string key="name">toggleViewButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo" key="toolbar">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo" key="topToolbar">
<string key="name">topToolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo" key="webView">
<string key="name">webView</string>
<string key="candidateClassName">UIWebView</string>

View file

@ -16,6 +16,10 @@
@property (atomic, strong) IBOutlet NewsBlurAppDelegate *appDelegate;
- (void)adjustDashboardFrame;
- (void)adjustDashboardScreen;
- (void)adjustFeedDetailScreen;
- (void)transitionToFeedDetail;
- (void)transitionFromFeedDetail;
@end

View file

@ -14,6 +14,8 @@
#import "ShareViewController.h"
#define NB_DEFAULT_MASTER_WIDTH 270
#define NB_DEFAULT_STORY_TITLE_HEIGHT 250
#define NB_DEFAULT_SLIDER_INTERVAL 3.4
@interface NBContainerViewController ()
@ -24,6 +26,8 @@
@property (nonatomic, strong) StoryDetailViewController *storyDetailViewController;
@property (nonatomic, strong) ShareViewController *shareViewController;
@property (readwrite) BOOL feedDetailIsVisible;
@end
@implementation NBContainerViewController
@ -35,6 +39,7 @@
@synthesize dashboardViewController;
@synthesize storyDetailViewController;
@synthesize shareViewController;
@synthesize feedDetailIsVisible;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
@ -56,20 +61,22 @@
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];
self.feedDetailViewController = appDelegate.feedDetailViewController;
self.storyDetailViewController = appDelegate.storyDetailViewController;
// adding dashboardViewController
[self addChildViewController:self.dashboardViewController];
[self.view addSubview:self.dashboardViewController.view];
[self.dashboardViewController didMoveToParentViewController:self];
// adding master navigation controller
[self addChildViewController:self.masterNavigationController];
[self.view addSubview:self.masterNavigationController.view];
[self.masterNavigationController didMoveToParentViewController:self];
}
- (void)viewWillLayoutSubviews {
[self adjustDashboardFrame];
[self adjustDashboardScreen];
}
- (void)viewDidUnload {
@ -86,23 +93,123 @@
}
- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
[self adjustDashboardFrame];
if (!self.feedDetailIsVisible) {
[self adjustDashboardScreen];
} else {
[self adjustFeedDetailScreen];
}
}
# pragma mark Screen Transitions and Layout
- (void)adjustDashboardFrame {
- (void)adjustDashboardScreen {
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 {
- (void)adjustFeedDetailScreen {
CGRect vb = [self.view bounds];
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
if (UIInterfaceOrientationIsPortrait(orientation)) {
if ([[self.masterNavigationController viewControllers] containsObject:self.feedDetailViewController]) {
[self.masterNavigationController popViewControllerAnimated:NO];
}
self.storyDetailViewController.view.frame = CGRectMake(0, 0, vb.size.width, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT);
self.feedDetailViewController.view.frame = CGRectMake(0, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT, vb.size.width, NB_DEFAULT_STORY_TITLE_HEIGHT);
[self.view addSubview:self.feedDetailViewController.view];
[self.masterNavigationController.view removeFromSuperview];
} else {
if (![[self.masterNavigationController viewControllers] containsObject:self.feedDetailViewController]) {
[self.masterNavigationController pushViewController:self.feedDetailViewController animated:NO];
}
[self.view addSubview:self.masterNavigationController.view];
self.masterNavigationController.view.frame = CGRectMake(0, 0, NB_DEFAULT_MASTER_WIDTH, vb.size.height);
self.storyDetailViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH + 1, 0, vb.size.width - NB_DEFAULT_MASTER_WIDTH - 1, vb.size.height);
}
}
- (void)transitionToFeedDetail {
self.feedDetailIsVisible = YES;
CGRect vb = [self.view bounds];
// adding feedDetailViewController
[self addChildViewController:self.feedDetailViewController];
[self.view addSubview:self.feedDetailViewController.view];
[self.feedDetailViewController didMoveToParentViewController:self];
// adding storyDetailViewController
[self addChildViewController:self.storyDetailViewController];
[self.view addSubview:self.storyDetailViewController.view];
[self.storyDetailViewController didMoveToParentViewController:self];
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
if (UIInterfaceOrientationIsPortrait(orientation)) {
self.storyDetailViewController.view.frame = CGRectMake(vb.size.width, 0, vb.size.width, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT);
self.feedDetailViewController.view.frame = CGRectMake(vb.size.width, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT, vb.size.width, NB_DEFAULT_STORY_TITLE_HEIGHT);
float largeTimeInterval = NB_DEFAULT_SLIDER_INTERVAL * ( vb.size.width - NB_DEFAULT_MASTER_WIDTH) / vb.size.width;
float smallTimeInterval = NB_DEFAULT_SLIDER_INTERVAL * NB_DEFAULT_MASTER_WIDTH / vb.size.width;
[UIView animateWithDuration:largeTimeInterval delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
self.storyDetailViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH + 1, 0, vb.size.width, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT);
self.feedDetailViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH + 1, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT, vb.size.width, NB_DEFAULT_STORY_TITLE_HEIGHT);
} completion:^(BOOL finished) {
[UIView animateWithDuration:smallTimeInterval delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
self.storyDetailViewController.view.frame = CGRectMake(0, 0, vb.size.width, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT);
self.feedDetailViewController.view.frame = CGRectMake(0, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT, vb.size.width, NB_DEFAULT_STORY_TITLE_HEIGHT);
self.masterNavigationController.view.frame = CGRectMake( -NB_DEFAULT_MASTER_WIDTH, 0, NB_DEFAULT_MASTER_WIDTH, vb.size.height);
} completion:^(BOOL finished) {
[self.dashboardViewController.view removeFromSuperview];
[self.masterNavigationController.view removeFromSuperview];
}];
}];
} else {
[self.masterNavigationController pushViewController:self.feedDetailViewController animated:YES];
self.storyDetailViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH + 1, 0, vb.size.width - NB_DEFAULT_MASTER_WIDTH - 1, vb.size.height);
[self.dashboardViewController.view removeFromSuperview];
}
}
- (void)transitionFromFeedDetail {
self.feedDetailIsVisible = NO;
CGRect vb = [self.view bounds];
// adding dashboardViewController and masterNavigationController
[self.view insertSubview:self.dashboardViewController.view atIndex:0];
[self.view addSubview:self.masterNavigationController.view];
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
if (UIInterfaceOrientationIsPortrait(orientation)) {
self.dashboardViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH + 1, 0, vb.size.width - NB_DEFAULT_MASTER_WIDTH - 1, vb.size.height);
self.masterNavigationController.view.frame = CGRectMake(-NB_DEFAULT_MASTER_WIDTH, 0, NB_DEFAULT_MASTER_WIDTH, vb.size.height);
float largeTimeInterval = NB_DEFAULT_SLIDER_INTERVAL * ( vb.size.width - NB_DEFAULT_MASTER_WIDTH) / vb.size.width;
float smallTimeInterval = NB_DEFAULT_SLIDER_INTERVAL * NB_DEFAULT_MASTER_WIDTH / vb.size.width;
[UIView animateWithDuration:largeTimeInterval delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
self.masterNavigationController.view.frame = CGRectMake(0, 0, NB_DEFAULT_MASTER_WIDTH, vb.size.height);
self.storyDetailViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH, 0, vb.size.width, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT);
self.feedDetailViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT, vb.size.width, NB_DEFAULT_STORY_TITLE_HEIGHT);
} completion:^(BOOL finished) {
[UIView animateWithDuration:smallTimeInterval delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
self.storyDetailViewController.view.frame = CGRectMake(vb.size.width, 0, vb.size.width, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT);
self.feedDetailViewController.view.frame = CGRectMake(vb.size.width, vb.size.height - NB_DEFAULT_STORY_TITLE_HEIGHT, vb.size.width, NB_DEFAULT_STORY_TITLE_HEIGHT);
} completion:^(BOOL finished) {
[self.storyDetailViewController.view removeFromSuperview];
[self.feedDetailViewController.view removeFromSuperview];
}];
}];
} else {
// [self.masterNavigationController pushViewController:self.feedDetailViewController animated:YES];
// self.storyDetailViewController.view.frame = CGRectMake(NB_DEFAULT_MASTER_WIDTH + 1, 0, vb.size.width - NB_DEFAULT_MASTER_WIDTH - 1, vb.size.height);
// [self.dashboardViewController.view removeFromSuperview];
}
}
@end

View file

@ -362,7 +362,7 @@
[self.feedsViewController.feedTitlesTable reloadData];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[self.splitStoryController presentModalViewController:loginViewController animated:NO];
[self.masterContainerViewController presentModalViewController:loginViewController animated:NO];
} else {
[feedsMenuViewController dismissModalViewControllerAnimated:NO];
[self.navigationController presentModalViewController:loginViewController animated:NO];
@ -420,15 +420,7 @@
[self setFeedUserProfiles:nil];
self.inFeedDetail = YES;
UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc] initWithTitle: @"All"
style: UIBarButtonItemStyleBordered
target: nil
action: nil];
[feedsViewController.navigationItem setBackBarButtonItem: newBackButton];
UINavigationController *navController = self.navigationController;
[navController pushViewController:feedDetailViewController animated:YES];
[self showNavigationBar:YES];
navController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
// navController.navigationBar.tintColor = UIColorFromRGB(0x59f6c1);
popoverHasFeedView = YES;
@ -450,6 +442,17 @@
// }
//
// }
} else {
UIBarButtonItem *newBackButton = [[UIBarButtonItem alloc] initWithTitle: @"All"
style: UIBarButtonItemStyleBordered
target: nil
action: nil];
[feedsViewController.navigationItem setBackBarButtonItem: newBackButton];
UINavigationController *navController = self.navigationController;
[navController pushViewController:feedDetailViewController animated:YES];
[self showNavigationBar:YES];
navController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
}
}

View file

@ -24,6 +24,7 @@
UIBarButtonItem *activity;
UIActivityIndicatorView *loadingIndicator;
UIPopoverController *popoverController;
UIToolbar *topToolbar;
}
@property (nonatomic, strong) UIActivityIndicatorView *loadingIndicator;
@ -40,6 +41,7 @@
@property (nonatomic) IBOutlet UIView *feedTitleGradient;
@property (nonatomic) IBOutlet UIBarButtonItem *buttonNextStory;
@property (nonatomic) UIPopoverController *popoverController;
@property (nonatomic) IBOutlet UIToolbar *topToolbar;
- (void)setNextPreviousButtons;
- (void)markStoryAsRead;
@ -66,5 +68,6 @@
- (NSString *)getReplies:(NSArray *)replies forUserId:(NSString *)commentUserId;
- (NSString *)getAvatars:(BOOL)areFriends;
- (NSDictionary *)getUser:(int)user_id;
- (void)transitionFromFeedDetail;
@end

View file

@ -20,6 +20,7 @@
#import "Utilities.h"
#import "JSON.h"
#import "NSString+HTML.h"
#import "NBContainerViewController.h"
@implementation StoryDetailViewController
@ -37,6 +38,7 @@
@synthesize feedTitleGradient;
@synthesize buttonNextStory;
@synthesize popoverController;
@synthesize topToolbar;
#pragma mark -
#pragma mark View boilerplate
@ -83,9 +85,22 @@
self.navigationItem.backBarButtonItem = back;
self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects:originalButton, fontSettingsButton, nil];
} else {
// UIButton *backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
// backBtn.frame = CGRectMake(0, 0, 51, 31);
// [backBtn setImage:[UIImage imageNamed:@"nav_btn_back.png"] forState:UIControlStateNormal];
// [backBtn addTarget:self action:@selector(showUserProfilePopover) forControlEvents:UIControlEventTouchUpInside];
UIBarButtonItem *backButton = [[UIBarButtonItem alloc]
initWithTitle:@"Back" style:UIBarButtonItemStyleBordered target:self action:@selector(transitionFromFeedDetail)];
self.topToolbar.items = [NSArray arrayWithObjects:backButton, nil];
self.topToolbar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
}
}
- (void)transitionFromFeedDetail {
[appDelegate.masterContainerViewController transitionFromFeedDetail];
}
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
return YES;
}
@ -106,6 +121,7 @@
- (void)viewDidUnload {
[self setButtonNextStory:nil];
[self setInnerView:nil];
[self setTopToolbar:nil];
[super viewDidUnload];
}

View file

@ -42,14 +42,29 @@
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUIToolbar" id="88679899">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{768, 44}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="506862915"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSMutableArray" key="IBUIItems">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<object class="IBUIWebView" id="506862915">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{768, 936}</string>
<int key="NSvFlags">-2147483374</int>
<string key="NSFrame">{{0, 44}, {768, 892}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="155973878"/>
<object class="NSColor" key="IBUIBackgroundColor">
<object class="NSColor" key="IBUIBackgroundColor" id="277502852">
<int key="NSColorSpace">10</int>
<object class="NSImage" key="NSImage">
<int key="NSImageFlags">549453824</int>
@ -4544,20 +4559,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
</object>
</object>
</object>
<string key="NSFrame">{{0, 44}, {768, 980}}</string>
<string key="NSFrameSize">{768, 980}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="506862915"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
<object class="NSColorSpace" key="NSCustomColorSpace">
<int key="NSID">2</int>
</object>
</object>
<object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
<bool key="IBUIPrompted">NO</bool>
</object>
<reference key="NSNextKeyView" ref="88679899"/>
<reference key="IBUIBackgroundColor" ref="277502852"/>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
</object>
@ -4628,6 +4634,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
</object>
<int key="connectionID">54</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">topToolbar</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="88679899"/>
</object>
<int key="connectionID">89</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
@ -4677,8 +4691,9 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="object" ref="191373211"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="506862915"/>
<reference ref="155973878"/>
<reference ref="506862915"/>
<reference ref="88679899"/>
</object>
<reference key="parent" ref="0"/>
</object>
@ -4769,6 +4784,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="object" ref="506862915"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">86</int>
<reference key="object" ref="88679899"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="191373211"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -4793,6 +4816,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>80.IBPluginDependency</string>
<string>82.IBPluginDependency</string>
<string>83.IBPluginDependency</string>
<string>86.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -4817,6 +4841,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@ -4831,7 +4856,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">85</int>
<int key="maxID">89</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -6506,6 +6531,25 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<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>
@ -6529,6 +6573,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>ftuxNavigationController</string>
<string>googleReaderViewController</string>
<string>loginViewController</string>
<string>masterContainerViewController</string>
<string>moveSiteViewController</string>
<string>navigationController</string>
<string>originalStoryViewController</string>
@ -6558,6 +6603,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>UINavigationController</string>
<string>GoogleReaderViewController</string>
<string>LoginViewController</string>
<string>NBContainerViewController</string>
<string>MoveSiteViewController</string>
<string>UINavigationController</string>
<string>OriginalStoryViewController</string>
@ -6590,6 +6636,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>ftuxNavigationController</string>
<string>googleReaderViewController</string>
<string>loginViewController</string>
<string>masterContainerViewController</string>
<string>moveSiteViewController</string>
<string>navigationController</string>
<string>originalStoryViewController</string>
@ -6667,6 +6714,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<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>
@ -7094,15 +7145,47 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<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">
@ -7172,8 +7255,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>feedTitleGradient</string>
<string>innerView</string>
<string>progressView</string>
<string>toggleViewButton</string>
<string>toolbar</string>
<string>topToolbar</string>
<string>webView</string>
</object>
<object class="NSArray" key="dict.values">
@ -7187,7 +7270,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>UIView</string>
<string>UIView</string>
<string>UIProgressView</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIToolbar</string>
<string>UIWebView</string>
</object>
@ -7205,8 +7288,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string>feedTitleGradient</string>
<string>innerView</string>
<string>progressView</string>
<string>toggleViewButton</string>
<string>toolbar</string>
<string>topToolbar</string>
<string>webView</string>
</object>
<object class="NSArray" key="dict.values">
@ -7248,11 +7331,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
<string key="candidateClassName">UIProgressView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toggleViewButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="name">topToolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo">

View file

@ -38,7 +38,7 @@
</object>
<object class="IBUIView" id="191373211">
<reference key="NSNextResponder"/>
<int key="NSvFlags">292</int>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBUITableView" id="576313732">
@ -73,7 +73,6 @@
<string key="NSFrame">{{0, 416}, {320, 44}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4yMjcwMjkxMjggMC4zNjIxMzU3NzY0IDAuNDU2NTIxNzM5MQA</bytes>
@ -521,51 +520,71 @@
<string key="className">DashboardViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">doLogout:</string>
<string key="NS.object.0">id</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doLogout:</string>
<string>tapSegmentedButton:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">doLogout:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">doLogout:</string>
<string key="candidateClassName">id</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>doLogout:</string>
<string>tapSegmentedButton:</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">doLogout:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">tapSegmentedButton:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>activitesLabel</string>
<string>activitiesModule</string>
<string>appDelegate</string>
<string>interactionsLabel</string>
<string>feedbackWebView</string>
<string>interactionsModule</string>
<string>segmentedButton</string>
<string>toolbar</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UILabel</string>
<string>ActivityModule</string>
<string>NewsBlurAppDelegate</string>
<string>UILabel</string>
<string>UIWebView</string>
<string>InteractionsModule</string>
<string>UISegmentedControl</string>
<string>UIToolbar</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>activitesLabel</string>
<string>activitiesModule</string>
<string>appDelegate</string>
<string>interactionsLabel</string>
<string>feedbackWebView</string>
<string>interactionsModule</string>
<string>segmentedButton</string>
<string>toolbar</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">activitesLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">activitiesModule</string>
<string key="candidateClassName">ActivityModule</string>
@ -575,13 +594,21 @@
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">interactionsLabel</string>
<string key="candidateClassName">UILabel</string>
<string key="name">feedbackWebView</string>
<string key="candidateClassName">UIWebView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">interactionsModule</string>
<string key="candidateClassName">InteractionsModule</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">segmentedButton</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@ -597,12 +624,12 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>toolbar</string>
<string>storyLabel</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UIToolbar</string>
<string>UILabel</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@ -610,7 +637,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>toolbar</string>
<string>storyLabel</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -619,8 +646,8 @@
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
<string key="name">storyLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
</object>
</object>
@ -802,7 +829,7 @@
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserViewController</string>
<string key="className">FirstTimeUserAddFriendsViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -861,6 +888,7 @@
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>previousButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
<string>welcomeView</string>
@ -874,6 +902,7 @@
<string>UIButton</string>
<string>UIImageView</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIButton</string>
<string>UIView</string>
@ -890,6 +919,7 @@
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>previousButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
<string>welcomeView</string>
@ -924,6 +954,10 @@
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">previousButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
@ -938,6 +972,362 @@
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FirstTimeUserAddFriendsViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserAddNewsBlurViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>tapCategoryButton:</string>
<string>tapGoogleReaderButton</string>
<string>tapNewsBlurButton:</string>
<string>tapNextButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>tapCategoryButton:</string>
<string>tapGoogleReaderButton</string>
<string>tapNewsBlurButton:</string>
<string>tapNextButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">tapCategoryButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">tapGoogleReaderButton</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">tapNewsBlurButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">tapNextButton</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addFriendsView</string>
<string>addNewsBlurView</string>
<string>addSitesView</string>
<string>appDelegate</string>
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>previousButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
<string>welcomeView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIView</string>
<string>UIView</string>
<string>UIView</string>
<string>NewsBlurAppDelegate</string>
<string>UIButton</string>
<string>UIImageView</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIButton</string>
<string>UIView</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addFriendsView</string>
<string>addNewsBlurView</string>
<string>addSitesView</string>
<string>appDelegate</string>
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>previousButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
<string>welcomeView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">addFriendsView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addNewsBlurView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addSitesView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">googleReaderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">previousButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbarTitle</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">welcomeView</string>
<string key="candidateClassName">UIView</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FirstTimeUserAddNewsBlurViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserAddSitesViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>tapCategoryButton:</string>
<string>tapGoogleReaderButton</string>
<string>tapNewsBlurButton:</string>
<string>tapNextButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>tapCategoryButton:</string>
<string>tapGoogleReaderButton</string>
<string>tapNewsBlurButton:</string>
<string>tapNextButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">tapCategoryButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">tapGoogleReaderButton</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">tapNewsBlurButton:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">tapNextButton</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addFriendsView</string>
<string>addNewsBlurView</string>
<string>addSitesView</string>
<string>appDelegate</string>
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>previousButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
<string>welcomeView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>UIView</string>
<string>UIView</string>
<string>UIView</string>
<string>NewsBlurAppDelegate</string>
<string>UIButton</string>
<string>UIImageView</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIButton</string>
<string>UIView</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addFriendsView</string>
<string>addNewsBlurView</string>
<string>addSitesView</string>
<string>appDelegate</string>
<string>googleReaderButton</string>
<string>logo</string>
<string>nextButton</string>
<string>previousButton</string>
<string>toolbar</string>
<string>toolbarTitle</string>
<string>welcomeView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">addFriendsView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addNewsBlurView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">addSitesView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">googleReaderButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">previousButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbar</string>
<string key="candidateClassName">UIToolbar</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">toolbarTitle</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">welcomeView</string>
<string key="candidateClassName">UIView</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FirstTimeUserAddSitesViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">FirstTimeUserViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">tapNextButton</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">tapNextButton</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">tapNextButton</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>logo</string>
<string>nextButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NewsBlurAppDelegate</string>
<string>UIImageView</string>
<string>UIBarButtonItem</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>appDelegate</string>
<string>logo</string>
<string>nextButton</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">logo</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">nextButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/FirstTimeUserViewController.h</string>
@ -1589,6 +1979,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>
@ -1603,17 +2012,23 @@
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
<string>findFriendsNavigationController</string>
<string>firstTimeUserAddFriendsViewController</string>
<string>firstTimeUserAddNewsBlurViewController</string>
<string>firstTimeUserAddSitesViewController</string>
<string>firstTimeUserViewController</string>
<string>fontSettingsViewController</string>
<string>friendsListViewController</string>
<string>ftuxNavigationController</string>
<string>googleReaderViewController</string>
<string>loginViewController</string>
<string>masterContainerViewController</string>
<string>moveSiteViewController</string>
<string>navigationController</string>
<string>originalStoryViewController</string>
<string>shareViewController</string>
<string>splitStoryController</string>
<string>splitStoryDetailNavigationController</string>
<string>storyDetailContainerViewController</string>
<string>storyDetailViewController</string>
<string>userProfileViewController</string>
<string>window</string>
@ -1627,17 +2042,23 @@
<string>FeedsMenuViewController</string>
<string>NewsBlurViewController</string>
<string>UINavigationController</string>
<string>FirstTimeUserAddFriendsViewController</string>
<string>FirstTimeUserAddNewsBlurViewController</string>
<string>FirstTimeUserAddSitesViewController</string>
<string>FirstTimeUserViewController</string>
<string>FontSettingsViewController</string>
<string>FriendsListViewController</string>
<string>UINavigationController</string>
<string>GoogleReaderViewController</string>
<string>LoginViewController</string>
<string>NBContainerViewController</string>
<string>MoveSiteViewController</string>
<string>UINavigationController</string>
<string>OriginalStoryViewController</string>
<string>ShareViewController</string>
<string>MGSplitViewController</string>
<string>UINavigationController</string>
<string>StoryDetailContainerViewController</string>
<string>StoryDetailViewController</string>
<string>UserProfileViewController</string>
<string>UIWindow</string>
@ -1654,17 +2075,23 @@
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
<string>findFriendsNavigationController</string>
<string>firstTimeUserAddFriendsViewController</string>
<string>firstTimeUserAddNewsBlurViewController</string>
<string>firstTimeUserAddSitesViewController</string>
<string>firstTimeUserViewController</string>
<string>fontSettingsViewController</string>
<string>friendsListViewController</string>
<string>ftuxNavigationController</string>
<string>googleReaderViewController</string>
<string>loginViewController</string>
<string>masterContainerViewController</string>
<string>moveSiteViewController</string>
<string>navigationController</string>
<string>originalStoryViewController</string>
<string>shareViewController</string>
<string>splitStoryController</string>
<string>splitStoryDetailNavigationController</string>
<string>storyDetailContainerViewController</string>
<string>storyDetailViewController</string>
<string>userProfileViewController</string>
<string>window</string>
@ -1699,6 +2126,18 @@
<string key="name">findFriendsNavigationController</string>
<string key="candidateClassName">UINavigationController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">firstTimeUserAddFriendsViewController</string>
<string key="candidateClassName">FirstTimeUserAddFriendsViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">firstTimeUserAddNewsBlurViewController</string>
<string key="candidateClassName">FirstTimeUserAddNewsBlurViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">firstTimeUserAddSitesViewController</string>
<string key="candidateClassName">FirstTimeUserAddSitesViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">firstTimeUserViewController</string>
<string key="candidateClassName">FirstTimeUserViewController</string>
@ -1711,6 +2150,10 @@
<string key="name">friendsListViewController</string>
<string key="candidateClassName">FriendsListViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">ftuxNavigationController</string>
<string key="candidateClassName">UINavigationController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">googleReaderViewController</string>
<string key="candidateClassName">GoogleReaderViewController</string>
@ -1719,6 +2162,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>
@ -1743,6 +2190,10 @@
<string key="name">splitStoryDetailNavigationController</string>
<string key="candidateClassName">UINavigationController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">storyDetailContainerViewController</string>
<string key="candidateClassName">StoryDetailContainerViewController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">storyDetailViewController</string>
<string key="candidateClassName">StoryDetailViewController</string>
@ -1827,8 +2278,8 @@
<string>feedTitlesTable</string>
<string>feedViewToolbar</string>
<string>homeButton</string>
<string>innerView</string>
<string>intelligenceControl</string>
<string>popoverController</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1837,8 +2288,8 @@
<string>UITableView</string>
<string>UIToolbar</string>
<string>UIBarButtonItem</string>
<string>UIView</string>
<string>UISegmentedControl</string>
<string>UIPopoverController</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@ -1850,8 +2301,8 @@
<string>feedTitlesTable</string>
<string>feedViewToolbar</string>
<string>homeButton</string>
<string>innerView</string>
<string>intelligenceControl</string>
<string>popoverController</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1876,12 +2327,12 @@
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">intelligenceControl</string>
<string key="candidateClassName">UISegmentedControl</string>
<string key="name">innerView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">popoverController</string>
<string key="candidateClassName">UIPopoverController</string>
<string key="name">intelligenceControl</string>
<string key="candidateClassName">UISegmentedControl</string>
</object>
</object>
</object>
@ -2139,6 +2590,57 @@
<string key="minorKey">./Classes/ShareViewController.h</string>
</object>
</object>
<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">
<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">
<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">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/StoryDetailContainerViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">StoryDetailViewController</string>
<string key="superclassName">UIViewController</string>
@ -2201,7 +2703,6 @@
<string>feedTitleGradient</string>
<string>innerView</string>
<string>progressView</string>
<string>toggleViewButton</string>
<string>toolbar</string>
<string>webView</string>
</object>
@ -2216,7 +2717,6 @@
<string>UIView</string>
<string>UIView</string>
<string>UIProgressView</string>
<string>UIBarButtonItem</string>
<string>UIToolbar</string>
<string>UIWebView</string>
</object>
@ -2234,7 +2734,6 @@
<string>feedTitleGradient</string>
<string>innerView</string>
<string>progressView</string>
<string>toggleViewButton</string>
<string>toolbar</string>
<string>webView</string>
</object>
@ -2276,10 +2775,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>