FTUX for iphone

2025-09-18 21:43:31 +00:00 · 2012-08-11 18:03:28 -07:00 · 2012-08-11 18:03:28 -07:00 · a2cd9c2efa
commit a2cd9c2efa
parent 4e6a553f4e
16 changed files with 372 additions and 214 deletions
--- a/media/ios/Classes/AuthorizeServicesViewController.m
+++ b/media/ios/Classes/AuthorizeServicesViewController.m
@ -68,6 +68,14 @@
        return NO;
    }
    
+    // for failed google reader authorization
+    if ([URLString isEqualToString:[NSString stringWithFormat:@"http://%@/import/callback?error=access_denied", NEWSBLUR_URL]]) {
+        [self.navigationController popViewControllerAnimated:YES];
+        [appDelegate.firstTimeUserAddSitesViewController importFromGoogleReaderFailed];
+        return NO;
+    }
+
+    
    return YES;
 }

--- a/media/ios/Classes/FeedDetailTableCell.m
+++ b/media/ios/Classes/FeedDetailTableCell.m
@ -172,15 +172,15 @@ static UIFont *indicatorFont = nil;
        CGContextSetAlpha(context, 0.25);
    }
    CGContextSetLineWidth(context, 6.0f);
-//    CGContextBeginPath(context);
-//    CGContextMoveToPoint(context, 3.0f, 1.0f);
-//    CGContextAddLineToPoint(context, 3.0f, self.frame.size.height - 1);
-//    CGContextStrokePath(context);
+    CGContextBeginPath(context);
+    CGContextMoveToPoint(context, 3.0f, 1.0f);
+    CGContextAddLineToPoint(context, 3.0f, self.frame.size.height - 1);
+    CGContextStrokePath(context);

    CGContextSetStrokeColor(context, CGColorGetComponents([self.feedColorBar CGColor]));
    CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 3.0f, 1.0f);
-    CGContextAddLineToPoint(context, 3.0, self.frame.size.height - 1);
+    CGContextMoveToPoint(context, 9.0f, 1.0f);
+    CGContextAddLineToPoint(context, 9.0, self.frame.size.height - 1);
    CGContextStrokePath(context);
    
    // reset for borders
@ -242,14 +242,14 @@ static UIFont *indicatorFont = nil;
        scoreColor = UIColorFromRGB(0x3B7613);
    }
    CGContextSetFillColorWithColor(context, UIColorFromRGB(0xf4f4f4).CGColor);
-    CGContextFillEllipseInRect(context, CGRectMake(1, storyIndicatorY + 12, 12, 12));
+    CGContextFillEllipseInRect(context, CGRectMake(7, storyIndicatorY + 12, 12, 12));

    if (self.isRead) {
        CGContextSetAlpha(context, 0.25);
    }
    
    CGContextSetFillColorWithColor(context, scoreColor.CGColor);
-    CGContextFillEllipseInRect(context, CGRectMake(3, storyIndicatorY + 14, 8, 8));
+    CGContextFillEllipseInRect(context, CGRectMake(9, storyIndicatorY + 14, 8, 8));
 }

 - (UIImage *)imageByApplyingAlpha:(UIImage *)image withAlpha:(CGFloat) alpha {
--- a/media/ios/Classes/FirstTimeUserAddFriendsViewController.h
+++ b/media/ios/Classes/FirstTimeUserAddFriendsViewController.h
@ -20,7 +20,7 @@
@property (weak, nonatomic) IBOutlet UIButton *twitterButton;
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *facebookActivityIndicator;
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *twitterActivityIndicator;
-
+@property (weak, nonatomic) IBOutlet UILabel *friendsLabel;

 - (IBAction)tapNextButton;
 - (IBAction)tapTwitterButton;
--- a/media/ios/Classes/FirstTimeUserAddFriendsViewController.m
+++ b/media/ios/Classes/FirstTimeUserAddFriendsViewController.m
@ -57,7 +57,14 @@


 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-	return YES;
+    // Return YES for supported orientations
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        return YES;
+    } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) {
+        return YES;
+    }
+    
+    return NO;
 }

 - (IBAction)tapNextButton {
--- a/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib
+++ b/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib
@ -38,7 +38,7 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIImageView" id="37499781">
+					<object class="IBUIImageView" id="425746832">
 						<reference key="NSNextResponder" ref="874391841"/>
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{540, 576}</string>
@ -57,8 +57,8 @@
 					</object>
 					<object class="IBUILabel" id="736025522">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{0, 59}, {540, 100}}</string>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{20, 59}, {500, 100}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="467269529"/>
@ -93,11 +93,11 @@
 					</object>
 					<object class="IBUIButton" id="467269529">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{178, 190}, {184, 34}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="36248693"/>
+						<reference key="NSNextKeyView" ref="886247703"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -130,9 +130,9 @@
 							<int key="NSfFlags">16</int>
 						</object>
 					</object>
-					<object class="IBUIActivityIndicatorView" id="36248693">
+					<object class="IBUIActivityIndicatorView" id="886247703">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">-2147483356</int>
+						<int key="NSvFlags">-2147483347</int>
 						<string key="NSFrame">{{215, 197}, {20, 20}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
@ -143,11 +143,11 @@
 					</object>
 					<object class="IBUIButton" id="406293652">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{178, 298}, {184, 34}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="765133113"/>
+						<reference key="NSNextKeyView" ref="43930813"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -180,9 +180,9 @@
 							<int key="NSfFlags">16</int>
 						</object>
 					</object>
-					<object class="IBUIActivityIndicatorView" id="765133113">
+					<object class="IBUIActivityIndicatorView" id="43930813">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">-2147483356</int>
+						<int key="NSvFlags">-2147483347</int>
 						<string key="NSFrame">{{215, 305}, {20, 20}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
@ -195,7 +195,7 @@
 				<string key="NSFrame">{{0, 44}, {540, 576}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="37499781"/>
+				<reference key="NSNextKeyView" ref="425746832"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -256,7 +256,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">facebookActivityIndicator</string>
 						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="36248693"/>
+						<reference key="destination" ref="886247703"/>
 					</object>
 					<int key="connectionID">140</int>
 				</object>
@ -264,10 +264,18 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">twitterActivityIndicator</string>
 						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="765133113"/>
+						<reference key="destination" ref="43930813"/>
 					</object>
 					<int key="connectionID">141</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">friendsLabel</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="736025522"/>
+					</object>
+					<int key="connectionID">143</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">tapFacebookButton</string>
@ -310,12 +318,12 @@
 						<int key="objectID">129</int>
 						<reference key="object" ref="874391841"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="37499781"/>
+							<reference ref="425746832"/>
 							<reference ref="736025522"/>
-							<reference ref="36248693"/>
 							<reference ref="406293652"/>
 							<reference ref="467269529"/>
-							<reference ref="765133113"/>
+							<reference ref="43930813"/>
+							<reference ref="886247703"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@ -336,17 +344,17 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">138</int>
-						<reference key="object" ref="36248693"/>
+						<reference key="object" ref="886247703"/>
 						<reference key="parent" ref="874391841"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">139</int>
-						<reference key="object" ref="765133113"/>
+						<reference key="object" ref="43930813"/>
 						<reference key="parent" ref="874391841"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">142</int>
-						<reference key="object" ref="37499781"/>
+						<reference key="object" ref="425746832"/>
 						<reference key="parent" ref="874391841"/>
 					</object>
 				</array>
@ -370,7 +378,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">142</int>
+			<int key="maxID">143</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -713,6 +721,7 @@
 						<string key="appDelegate">NewsBlurAppDelegate</string>
 						<string key="facebookActivityIndicator">UIActivityIndicatorView</string>
 						<string key="facebookButton">UIButton</string>
+						<string key="friendsLabel">UILabel</string>
 						<string key="nextButton">UIBarButtonItem</string>
 						<string key="twitterActivityIndicator">UIActivityIndicatorView</string>
 						<string key="twitterButton">UIButton</string>
@ -730,6 +739,10 @@
 							<string key="name">facebookButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="friendsLabel">
+							<string key="name">friendsLabel</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="nextButton">
 							<string key="name">nextButton</string>
 							<string key="candidateClassName">UIBarButtonItem</string>
@ -911,6 +924,8 @@
 					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="appDelegate">NewsBlurAppDelegate</string>
+						<string key="footer">UILabel</string>
+						<string key="header">UILabel</string>
 						<string key="logo">UIImageView</string>
 						<string key="nextButton">UIBarButtonItem</string>
 					</dictionary>
@ -919,6 +934,14 @@
 							<string key="name">appDelegate</string>
 							<string key="candidateClassName">NewsBlurAppDelegate</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="footer">
+							<string key="name">footer</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="header">
+							<string key="name">header</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="logo">
 							<string key="name">logo</string>
 							<string key="candidateClassName">UIImageView</string>
--- a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m
+++ b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m
@ -74,9 +74,15 @@
    
 }

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-	return YES;
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+    // Return YES for supported orientations
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        return YES;
+    } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) {
+        return YES;
+    }
+    
+    return NO;
 }


--- a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib
+++ b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib
@ -37,7 +37,7 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIImageView" id="245132710">
+					<object class="IBUIImageView" id="641072983">
 						<reference key="NSNextResponder" ref="874391841"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrameSize">{540, 576}</string>
@ -56,8 +56,8 @@
 					</object>
 					<object class="IBUILabel" id="804223306">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{0, 100}, {540, 100}}</string>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{20, 129}, {500, 100}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="754909752"/>
@ -73,7 +73,7 @@
 							<bytes key="NSRGB">MCAwIDAAA</bytes>
 						</object>
 						<nil key="IBUIHighlightedColor"/>
-						<object class="NSColor" key="IBUIShadowColor" id="61998700">
+						<object class="NSColor" key="IBUIShadowColor" id="222909269">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
 						</object>
@ -92,10 +92,11 @@
 					</object>
 					<object class="IBUIButton" id="754909752">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{130, 248}, {280, 80}}</string>
+						<int key="NSvFlags">301</int>
+						<string key="NSFrame">{{178, 271}, {184, 34}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@ -104,7 +105,7 @@
 						<int key="IBUIButtonType">1</int>
 						<string key="IBUISelectedTitle">Added NewsBlur</string>
 						<string key="IBUINormalTitle">Add NewsBlur Blog</string>
-						<reference key="IBUIHighlightedTitleColor" ref="61998700"/>
+						<reference key="IBUIHighlightedTitleColor" ref="222909269"/>
 						<object class="NSColor" key="IBUISelectedTitleColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
@ -138,7 +139,7 @@
 				<string key="NSFrame">{{0, 44}, {540, 576}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="245132710"/>
+				<reference key="NSNextKeyView" ref="641072983"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -201,8 +202,8 @@
 						<int key="objectID">129</int>
 						<reference key="object" ref="874391841"/>
 						<array class="NSMutableArray" key="children">
+							<reference ref="641072983"/>
 							<reference ref="804223306"/>
-							<reference ref="245132710"/>
 							<reference ref="754909752"/>
 						</array>
 						<reference key="parent" ref="0"/>
@ -214,7 +215,7 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">131</int>
-						<reference key="object" ref="245132710"/>
+						<reference key="object" ref="641072983"/>
 						<reference key="parent" ref="874391841"/>
 					</object>
 					<object class="IBObjectRecord">
--- a/media/ios/Classes/FirstTimeUserAddSitesViewController.h
+++ b/media/ios/Classes/FirstTimeUserAddSitesViewController.h
@ -26,5 +26,6 @@

 - (void)addCategories;
 - (void)importFromGoogleReader;
+- (void)importFromGoogleReaderFailed;
 - (void)updateSites;
@end
--- a/media/ios/Classes/FirstTimeUserAddSitesViewController.m
+++ b/media/ios/Classes/FirstTimeUserAddSitesViewController.m
@ -52,6 +52,10 @@
    self.navigationItem.title = @"Step 2 of 4";
    self.activityIndicator.hidesWhenStopped = YES;
    
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+        self.instructionLabel.font = [UIFont systemFontOfSize:16];
+    }
+    
 }

 - (void)viewDidUnload
@ -66,9 +70,15 @@
    [self setNextButton:nil];
 }

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-	return YES;
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+    // Return YES for supported orientations
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        return YES;
+    } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) {
+        return YES;
+    }
+    
+    return NO;
 }


@ -106,6 +116,11 @@
    [request startAsynchronous];
 }

+- (void)importFromGoogleReaderFailed {
+    [self.googleReaderButton setTitle:@"Retry Google Reader" forState:UIControlStateNormal];
+    self.instructionLabel.text = @"Importing from Google Reader failed.  Please try again.";
+}
+
 - (void)finishImportFromGoogleReader:(ASIHTTPRequest *)request {
    NSString *responseString = [request responseString];
    NSData *responseData=[responseString dataUsingEncoding:NSUTF8StringEncoding];    
--- a/media/ios/Classes/FirstTimeUserAddSitesViewController.xib
+++ b/media/ios/Classes/FirstTimeUserAddSitesViewController.xib
@ -38,7 +38,7 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIImageView" id="62410955">
+					<object class="IBUIImageView" id="809490040">
 						<reference key="NSNextResponder" ref="874391841"/>
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{540, 576}</string>
@ -57,7 +57,7 @@
 					</object>
 					<object class="IBUIButton" id="35612574">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{178, 271}, {184, 34}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
@ -69,7 +69,7 @@
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<string key="IBUISelectedTitle">Imported!</string>
 						<string key="IBUINormalTitle">Google Reader</string>
-						<object class="NSColor" key="IBUIHighlightedTitleColor" id="322601585">
+						<object class="NSColor" key="IBUIHighlightedTitleColor" id="387740236">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
 						</object>
@ -80,7 +80,7 @@
 								<int key="NSID">2</int>
 							</object>
 						</object>
-						<reference key="IBUINormalTitleColor" ref="322601585"/>
+						<reference key="IBUINormalTitleColor" ref="387740236"/>
 						<object class="NSColor" key="IBUINormalTitleShadowColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC41AA</bytes>
@ -101,7 +101,7 @@
 					</object>
 					<object class="IBUILabel" id="895169245">
 						<reference key="NSNextResponder" ref="874391841"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">303</int>
 						<string key="NSFrame">{{20, 146}, {500, 100}}</string>
 						<reference key="NSSuperview" ref="874391841"/>
 						<reference key="NSWindow"/>
@ -118,7 +118,7 @@
 							<bytes key="NSRGB">MCAwIDAAA</bytes>
 						</object>
 						<nil key="IBUIHighlightedColor"/>
-						<reference key="IBUIShadowColor" ref="322601585"/>
+						<reference key="IBUIShadowColor" ref="387740236"/>
 						<int key="IBUIBaselineAdjustment">0</int>
 						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUINumberOfLines">3</int>
@ -148,7 +148,7 @@
 				<string key="NSFrame">{{0, 44}, {540, 576}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="62410955"/>
+				<reference key="NSNextKeyView" ref="809490040"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -244,7 +244,7 @@
 						<int key="objectID">129</int>
 						<reference key="object" ref="874391841"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="62410955"/>
+							<reference ref="809490040"/>
 							<reference ref="35612574"/>
 							<reference ref="659331283"/>
 							<reference ref="895169245"/>
@ -268,7 +268,7 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">138</int>
-						<reference key="object" ref="62410955"/>
+						<reference key="object" ref="809490040"/>
 						<reference key="parent" ref="874391841"/>
 					</object>
 				</array>
--- a/media/ios/Classes/FirstTimeUserViewController.h
+++ b/media/ios/Classes/FirstTimeUserViewController.h
@ -18,6 +18,8 @@
@property (nonatomic) IBOutlet NewsBlurAppDelegate *appDelegate;
@property (nonatomic) IBOutlet UIBarButtonItem *nextButton;
@property (nonatomic) IBOutlet UIImageView *logo;
+@property (weak, nonatomic) IBOutlet UILabel *header;
+@property (weak, nonatomic) IBOutlet UILabel *footer;

 - (IBAction)tapNextButton;
 - (void)rotateLogo;
--- a/media/ios/Classes/FirstTimeUserViewController.m
+++ b/media/ios/Classes/FirstTimeUserViewController.m
@ -28,6 +28,8 @@
@synthesize appDelegate;
@synthesize nextButton;
@synthesize logo;
+@synthesize header;
+@synthesize footer;
@synthesize angle_;

 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
@ -50,6 +52,12 @@
    self.navigationItem.rightBarButtonItem = next;
    
    self.navigationItem.title = @"Step 1 of 4";
+    
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+        logo.frame = CGRectMake(80, 135, 160, 160);
+        header.font = [UIFont systemFontOfSize:22];
+        footer.font = [UIFont systemFontOfSize:16];
+    }

 }

@ -57,12 +65,15 @@
 {
    [self setNextButton:nil];
    [self setLogo:nil];
+    [self setHeader:nil];
+    [self setFooter:nil];
    [super viewDidUnload];
    // Release any retained subviews of the main view.
    // e.g. self.myOutlet = nil;
 }

 - (void)viewWillAppear:(BOOL)animated {
+
    [self rotateLogo];
 }

@ -70,9 +81,15 @@

 }

- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-	return YES;
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+    // Return YES for supported orientations
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        return YES;
+    } else if (UIInterfaceOrientationIsPortrait(interfaceOrientation)) {
+        return YES;
+    }
+    
+    return NO;
 }


--- a/media/ios/Classes/FirstTimeUserViewController.xib
+++ b/media/ios/Classes/FirstTimeUserViewController.xib
@ -36,7 +36,7 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIImageView" id="971611551">
+					<object class="IBUIImageView" id="90654000">
 						<reference key="NSNextResponder" ref="437257068"/>
 						<int key="NSvFlags">274</int>
 						<string key="NSFrameSize">{540, 576}</string>
@ -55,8 +55,8 @@
 					</object>
 					<object class="IBUILabel" id="197119979">
 						<reference key="NSNextResponder" ref="437257068"/>
-						<int key="NSvFlags">306</int>
-						<string key="NSFrame">{{87, 439}, {366, 82}}</string>
+						<int key="NSvFlags">302</int>
+						<string key="NSFrame">{{20, 439}, {500, 82}}</string>
 						<reference key="NSSuperview" ref="437257068"/>
 						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
@ -71,13 +71,13 @@
 							<bytes key="NSRGB">MCAwIDAAA</bytes>
 						</object>
 						<nil key="IBUIHighlightedColor"/>
-						<object class="NSColor" key="IBUIShadowColor" id="316775812">
+						<object class="NSColor" key="IBUIShadowColor" id="953471020">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
 						</object>
 						<string key="IBUIShadowOffset">{0, 1}</string>
 						<int key="IBUIBaselineAdjustment">0</int>
-						<float key="IBUIMinimumFontSize">10</float>
+						<float key="IBUIMinimumFontSize">12</float>
 						<int key="IBUINumberOfLines">2</int>
 						<int key="IBUITextAlignment">1</int>
 						<object class="IBUIFontDescription" key="IBUIFontDescription">
@ -89,11 +89,12 @@
 							<double key="NSSize">22</double>
 							<int key="NSfFlags">16</int>
 						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 					</object>
 					<object class="IBUILabel" id="797930801">
 						<reference key="NSNextResponder" ref="437257068"/>
-						<int key="NSvFlags">306</int>
-						<string key="NSFrame">{{93, 65}, {355, 59}}</string>
+						<int key="NSvFlags">298</int>
+						<string key="NSFrame">{{20, 65}, {500, 59}}</string>
 						<reference key="NSSuperview" ref="437257068"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="524213128"/>
@ -106,7 +107,7 @@
 						<string key="IBUIText">Welcome to NewsBlur</string>
 						<reference key="IBUITextColor" ref="252007782"/>
 						<reference key="IBUIHighlightedColor" ref="252007782"/>
-						<reference key="IBUIShadowColor" ref="316775812"/>
+						<reference key="IBUIShadowColor" ref="953471020"/>
 						<string key="IBUIShadowOffset">{0, 1}</string>
 						<int key="IBUIBaselineAdjustment">0</int>
 						<float key="IBUIMinimumFontSize">10</float>
@ -120,10 +121,11 @@
 							<double key="NSSize">32</double>
 							<int key="NSfFlags">16</int>
 						</object>
+						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 					</object>
 					<object class="IBUIImageView" id="524213128">
 						<reference key="NSNextResponder" ref="437257068"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">301</int>
 						<string key="NSFrame">{{150, 168}, {240, 240}}</string>
 						<reference key="NSSuperview" ref="437257068"/>
 						<reference key="NSWindow"/>
@ -140,7 +142,7 @@
 				<string key="NSFrame">{{0, 44}, {540, 576}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="971611551"/>
+				<reference key="NSNextKeyView" ref="90654000"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
@ -189,6 +191,22 @@
 					</object>
 					<int key="connectionID">115</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">header</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="797930801"/>
+					</object>
+					<int key="connectionID">132</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">footer</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="197119979"/>
+					</object>
+					<int key="connectionID">133</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@ -213,10 +231,10 @@
 						<int key="objectID">129</int>
 						<reference key="object" ref="437257068"/>
 						<array class="NSMutableArray" key="children">
+							<reference ref="197119979"/>
+							<reference ref="90654000"/>
 							<reference ref="797930801"/>
 							<reference ref="524213128"/>
-							<reference ref="197119979"/>
-							<reference ref="971611551"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@ -237,7 +255,7 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">131</int>
-						<reference key="object" ref="971611551"/>
+						<reference key="object" ref="90654000"/>
 						<reference key="parent" ref="437257068"/>
 					</object>
 				</array>
@ -257,7 +275,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">131</int>
+			<int key="maxID">133</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -798,6 +816,8 @@
 					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="appDelegate">NewsBlurAppDelegate</string>
+						<string key="footer">UILabel</string>
+						<string key="header">UILabel</string>
 						<string key="logo">UIImageView</string>
 						<string key="nextButton">UIBarButtonItem</string>
 					</dictionary>
@ -806,6 +826,14 @@
 							<string key="name">appDelegate</string>
 							<string key="candidateClassName">NewsBlurAppDelegate</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="footer">
+							<string key="name">footer</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="header">
+							<string key="name">header</string>
+							<string key="candidateClassName">UILabel</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="logo">
 							<string key="name">logo</string>
 							<string key="candidateClassName">UIImageView</string>
--- a/media/ios/Classes/NewsBlurViewController.m
+++ b/media/ios/Classes/NewsBlurViewController.m
@ -289,7 +289,7 @@
                             options:kNilOptions 
                             error:&error];

-    NSLog(@"results are %@", results);
+//    NSLog(@"results are %@", results);
    [MBProgressHUD hideHUDForView:self.view animated:YES];
    self.stillVisibleFeeds = [NSMutableDictionary dictionary];
    self.visibleFeeds = [NSMutableDictionary dictionary];
@ -323,6 +323,7 @@
    
    self.navigationItem.leftBarButtonItem = userAvatar;
    [self setUserAvatarLayout:orientation];
+    
    // adding settings button to right

 //    UIImage *settingsImage = [UIImage imageNamed:@"settings.png"];
@ -345,9 +346,12 @@
    // Set up dictUserProfile and userActivitiesArray
    appDelegate.dictUserProfile = [results objectForKey:@"social_profile"];
    appDelegate.userActivitiesArray = [results objectForKey:@"activities"];
-    [appDelegate.dashboardViewController refreshInteractions];
-    [appDelegate.dashboardViewController refreshActivity];
-
+    
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        [appDelegate.dashboardViewController refreshInteractions];
+        [appDelegate.dashboardViewController refreshActivity];
+    }
+    
    // Set up dictSocialFeeds
    NSArray *socialFeedsArray = [results objectForKey:@"social_feeds"];
    NSMutableArray *socialFolder = [[NSMutableArray alloc] init];
--- 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.com"]
-//    #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
+//    #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"]
+    #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]

    #define NEWSBLUR_LINK_COLOR 0x405BA8
    #define NEWSBLUR_HIGHLIGHT_COLOR 0xd2e6fd
--- a/media/ios/Resources-iPhone/MainWindow.xib
+++ b/media/ios/Resources-iPhone/MainWindow.xib
@ -171,12 +171,49 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
+			<object class="IBUIViewController" id="1061218355">
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics" id="482200929"/>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+			</object>
+			<object class="IBUIViewController" id="877202670">
+				<reference key="IBUISimulatedStatusBarMetrics" ref="482200929"/>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+			</object>
+			<object class="IBUIViewController" id="751649567">
+				<reference key="IBUISimulatedStatusBarMetrics" ref="482200929"/>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+			</object>
+			<object class="IBUIViewController" id="778518863">
+				<reference key="IBUISimulatedStatusBarMetrics" ref="482200929"/>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+			</object>
 			<object class="IBUIWindow" id="117978783">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<string key="NSFrameSize">{320, 480}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@ -357,6 +394,38 @@
 					</object>
 					<int key="connectionID">147</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">firstTimeUserViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="1061218355"/>
+					</object>
+					<int key="connectionID">153</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">firstTimeUserAddFriendsViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="877202670"/>
+					</object>
+					<int key="connectionID">154</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">firstTimeUserAddNewsBlurViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="751649567"/>
+					</object>
+					<int key="connectionID">155</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">firstTimeUserAddSitesViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="778518863"/>
+					</object>
+					<int key="connectionID">156</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">appDelegate</string>
@ -453,6 +522,38 @@
 					</object>
 					<int key="connectionID">148</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">appDelegate</string>
+						<reference key="source" ref="1061218355"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">160</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">appDelegate</string>
+						<reference key="source" ref="877202670"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">159</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">appDelegate</string>
+						<reference key="source" ref="751649567"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">158</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">appDelegate</string>
+						<reference key="source" ref="778518863"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">157</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@ -587,6 +688,26 @@
 						<reference key="object" ref="738062285"/>
 						<reference key="parent" ref="0"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="1061218355"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="877202670"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">151</int>
+						<reference key="object" ref="751649567"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">152</int>
+						<reference key="object" ref="778518863"/>
+						<reference key="parent" ref="0"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@ -620,6 +741,14 @@
 					<string>143.IBPluginDependency</string>
 					<string>146.CustomClassName</string>
 					<string>146.IBPluginDependency</string>
+					<string>149.CustomClassName</string>
+					<string>149.IBPluginDependency</string>
+					<string>150.CustomClassName</string>
+					<string>150.IBPluginDependency</string>
+					<string>151.CustomClassName</string>
+					<string>151.IBPluginDependency</string>
+					<string>152.CustomClassName</string>
+					<string>152.IBPluginDependency</string>
 					<string>3.CustomClassName</string>
 					<string>3.IBPluginDependency</string>
 					<string>39.IBPluginDependency</string>
@ -661,6 +790,14 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>FontSettingsViewController</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>FirstTimeUserViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>FirstTimeUserAddFriendsViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>FirstTimeUserAddNewsBlurViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>FirstTimeUserAddSitesViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>NewsBlurAppDelegate</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -686,7 +823,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">148</int>
+			<int key="maxID">160</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1213,141 +1350,99 @@
 						<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>tapFacebookButton</string>
 							<string>tapNextButton</string>
+							<string>tapTwitterButton</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>tapFacebookButton</string>
 							<string>tapNextButton</string>
+							<string>tapTwitterButton</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="name">tapFacebookButton</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
 								<string key="name">tapNextButton</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">tapTwitterButton</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>facebookActivityIndicator</string>
+							<string>facebookButton</string>
 							<string>nextButton</string>
-							<string>previousButton</string>
-							<string>toolbar</string>
-							<string>toolbarTitle</string>
-							<string>welcomeView</string>
+							<string>twitterActivityIndicator</string>
+							<string>twitterButton</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>UIActivityIndicatorView</string>
 							<string>UIButton</string>
-							<string>UIImageView</string>
 							<string>UIBarButtonItem</string>
-							<string>UIBarButtonItem</string>
-							<string>UIToolbar</string>
+							<string>UIActivityIndicatorView</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>facebookActivityIndicator</string>
+							<string>facebookButton</string>
 							<string>nextButton</string>
-							<string>previousButton</string>
-							<string>toolbar</string>
-							<string>toolbarTitle</string>
-							<string>welcomeView</string>
+							<string>twitterActivityIndicator</string>
+							<string>twitterButton</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>
+								<string key="name">facebookActivityIndicator</string>
+								<string key="candidateClassName">UIActivityIndicatorView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">logo</string>
-								<string key="candidateClassName">UIImageView</string>
+								<string key="name">facebookButton</string>
+								<string key="candidateClassName">UIButton</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>
+								<string key="name">twitterActivityIndicator</string>
+								<string key="candidateClassName">UIActivityIndicatorView</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="name">twitterButton</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">
@ -1513,7 +1608,6 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>tapCategoryButton:</string>
 							<string>tapGoogleReaderButton</string>
-							<string>tapNewsBlurButton:</string>
 							<string>tapNextButton</string>
 						</object>
 						<object class="NSArray" key="dict.values">
@ -1521,7 +1615,6 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@ -1530,7 +1623,6 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>tapCategoryButton:</string>
 							<string>tapGoogleReaderButton</string>
-							<string>tapNewsBlurButton:</string>
 							<string>tapNextButton</string>
 						</object>
 						<object class="NSArray" key="dict.values">
@ -1543,10 +1635,6 @@
 								<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>
@ -1557,62 +1645,36 @@
 						<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>activityIndicator</string>
 							<string>appDelegate</string>
 							<string>googleReaderButton</string>
-							<string>logo</string>
+							<string>instructionLabel</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>UIActivityIndicatorView</string>
 							<string>NewsBlurAppDelegate</string>
 							<string>UIButton</string>
-							<string>UIImageView</string>
+							<string>UILabel</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>activityIndicator</string>
 							<string>appDelegate</string>
 							<string>googleReaderButton</string>
-							<string>logo</string>
+							<string>instructionLabel</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>
+								<string key="name">activityIndicator</string>
+								<string key="candidateClassName">UIActivityIndicatorView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">appDelegate</string>
@ -1623,29 +1685,13 @@
 								<string key="candidateClassName">UIButton</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">logo</string>
-								<string key="candidateClassName">UIImageView</string>
+								<string key="name">instructionLabel</string>
+								<string key="candidateClassName">UILabel</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">
@ -2790,7 +2836,6 @@
 							<string>commentField</string>
 							<string>facebookButton</string>
 							<string>submitButton</string>
-							<string>toolbarTitle</string>
 							<string>twitterButton</string>
 						</object>
 						<object class="NSArray" key="dict.values">
@ -2799,7 +2844,6 @@
 							<string>UITextView</string>
 							<string>UIButton</string>
 							<string>UIBarButtonItem</string>
-							<string>UIBarButtonItem</string>
 							<string>UIButton</string>
 						</object>
 					</object>
@ -2811,7 +2855,6 @@
 							<string>commentField</string>
 							<string>facebookButton</string>
 							<string>submitButton</string>
-							<string>toolbarTitle</string>
 							<string>twitterButton</string>
 						</object>
 						<object class="NSArray" key="dict.values">
@ -2832,10 +2875,6 @@
 								<string key="name">submitButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">toolbarTitle</string>
-								<string key="candidateClassName">UIBarButtonItem</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">twitterButton</string>
 								<string key="candidateClassName">UIButton</string>
@ -2928,6 +2967,7 @@
 							<string>originalStoryButton</string>
 							<string>progressView</string>
 							<string>progressViewContainer</string>
+							<string>subscribeButton</string>
 							<string>toolbar</string>
 							<string>webView</string>
 						</object>
@ -2947,6 +2987,7 @@
 							<string>UIBarButtonItem</string>
 							<string>UIProgressView</string>
 							<string>UIView</string>
+							<string>UIBarButtonItem</string>
 							<string>UIToolbar</string>
 							<string>UIWebView</string>
 						</object>
@ -2969,6 +3010,7 @@
 							<string>originalStoryButton</string>
 							<string>progressView</string>
 							<string>progressViewContainer</string>
+							<string>subscribeButton</string>
 							<string>toolbar</string>
 							<string>webView</string>
 						</object>
@ -3030,6 +3072,10 @@
 								<string key="name">progressViewContainer</string>
 								<string key="candidateClassName">UIView</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">subscribeButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">toolbar</string>
 								<string key="candidateClassName">UIToolbar</string>