diff --git a/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib b/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib
index 5234018..6deafe2 100644
--- a/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib
+++ b/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib
@@ -62,7 +62,7 @@
{{20, 70}, {500, 100}}
-
+
_NS:9
NO
YES
@@ -92,59 +92,37 @@
16
-
@@ -861,20 +888,10 @@
FirstTimeUserAddNewsBlurViewController
UIViewController
- id
- id
id
id
-
- tapCategoryButton:
- id
-
-
- tapGoogleReaderButton
- id
-
tapNewsBlurButton:
id
@@ -885,63 +902,23 @@
- UIView
- UIView
- UIView
NewsBlurAppDelegate
- UIButton
- UIImageView
+ UIButton
UIBarButtonItem
- UIBarButtonItem
- UIToolbar
- UIButton
- UIView
-
- addFriendsView
- UIView
-
-
- addNewsBlurView
- UIView
-
-
- addSitesView
- UIView
-
appDelegate
NewsBlurAppDelegate
-
- googleReaderButton
+
+ instructionsLabel
UIButton
-
- logo
- UIImageView
-
nextButton
UIBarButtonItem
-
- previousButton
- UIBarButtonItem
-
-
- toolbar
- UIToolbar
-
-
- toolbarTitle
- UIButton
-
-
- welcomeView
- UIView
-
IBProjectSource
@@ -1131,39 +1108,6 @@
- GoogleReaderViewController
- UIViewController
-
- tapCancelButton:
- id
-
-
- tapCancelButton:
-
- tapCancelButton:
- id
-
-
-
- NewsBlurAppDelegate
- UIWebView
-
-
-
- appDelegate
- NewsBlurAppDelegate
-
-
- webView
- UIWebView
-
-
-
- IBProjectSource
- ./Classes/GoogleReaderViewController.h
-
-
-
InteractionsModule
UIView
@@ -1425,7 +1369,6 @@
FontSettingsViewController
FriendsListViewController
UINavigationController
- GoogleReaderViewController
LoginViewController
NBContainerViewController
MoveSiteViewController
@@ -1493,10 +1436,6 @@
ftuxNavigationController
UINavigationController
-
- googleReaderViewController
- GoogleReaderViewController
-
loginViewController
LoginViewController
diff --git a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.h b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.h
index 2ab7b89..2a8f0a1 100644
--- a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.h
+++ b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.h
@@ -20,9 +20,11 @@
- (IBAction)tapNextButton;
- (IBAction)tapNewsBlurButton:(id)sender;
+- (IBAction)tapPopularButton:(id)sender;
- (void)finishAddSite:(ASIHTTPRequest *)request;
+- (void)finishAddPopular:(ASIHTTPRequest *)request;
- (void)requestFailed:(ASIHTTPRequest *)request;
- (void)addSite:(NSString *)siteUrl;
-
+- (void)addPopular;
@end
\ No newline at end of file
diff --git a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m
index b6ad1ca..6a8c5b8 100644
--- a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m
+++ b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m
@@ -76,13 +76,51 @@
UIButton *button = (UIButton *)sender;
button.selected = YES;
button.userInteractionEnabled = NO;
+
+ UIImage *checkmark = [UIImage imageNamed:@"258-checkmark"];
+ UIImageView *checkmarkView = [[UIImageView alloc] initWithImage:checkmark];
+ checkmarkView.frame = CGRectMake(button.frame.origin.x + button.frame.size.width - 24,
+ button.frame.origin.y + 8,
+ 16,
+ 16);
+ [self.view addSubview:checkmarkView];
+
[self addSite:@"http://blog.newsblur.com/"];
}
+- (IBAction)tapPopularButton:(id)sender {
+ UIButton *button = (UIButton *)sender;
+ button.selected = YES;
+ button.userInteractionEnabled = NO;
+
+ UIImage *checkmark = [UIImage imageNamed:@"258-checkmark"];
+ UIImageView *checkmarkView = [[UIImageView alloc] initWithImage:checkmark];
+ checkmarkView.frame = CGRectMake(button.frame.origin.x + button.frame.size.width - 24,
+ button.frame.origin.y + 8,
+ 16,
+ 16);
+ [self.view addSubview:checkmarkView];
+
+ [self addPopular];
+}
+
#pragma mark -
#pragma mark Add Site
+- (void)addPopular {
+ NSString *urlString = [NSString stringWithFormat:@"http://%@/social/follow",
+ NEWSBLUR_URL];
+ NSURL *url = [NSURL URLWithString:urlString];
+ ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:url];
+
+ [request setPostValue:@"social:popular" forKey:@"user_id"];
+ [request setDelegate:self];
+ [request setDidFinishSelector:@selector(finishAddSite:)];
+ [request setDidFailSelector:@selector(requestFailed:)];
+ [request startAsynchronous];
+}
+
- (void)addSite:(NSString *)siteUrl {
NSString *urlString = [NSString stringWithFormat:@"http://%@/reader/add_url",
NEWSBLUR_URL];
diff --git a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib
index a5a7437..bab9e97 100644
--- a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib
+++ b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib
@@ -94,14 +94,16 @@
301
- {{178, 271}, {184, 34}}
+ {{178, 220}, {184, 34}}
+
_NS:9
NO
IBIPadFramework
0
0
+ Following NewsBlur
Follow NewsBlur Blog
@@ -116,21 +118,51 @@
1
MC42IDAuNiAwLjYAA
-
+
NSImage
google.png
-
-
+
+
2
13
-
+
Helvetica-Bold
13
16
+
+
+ 301
+ {{178, 300}, {184, 34}}
+
+
+
+ _NS:9
+ NO
+ IBIPadFramework
+ 0
+ 0
+ Following Popular
+ Follow Popular Stories
+
+
+ 3
+ MQA
+
+
+
+
+ 1
+ MC42IDAuNiAwLjYAA
+
+
+
+
+
+
{{0, 44}, {540, 576}}
@@ -182,6 +214,33 @@
132
+
+
+ tapNewsBlurButton:
+
+
+ 7
+
+ 133
+
+
+
+ tapNewsBlurButton:
+
+
+ 7
+
+ 135
+
+
+
+ tapPopularButton:
+
+
+ 7
+
+ 136
+
@@ -207,8 +266,9 @@
-
+
+
@@ -227,6 +287,11 @@
+
+ 134
+
+
+
@@ -236,15 +301,17 @@
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+ com.apple.InterfaceBuilder.IBCocoaTouchPlugin
+
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
+
- 132
+ 136
@@ -856,39 +923,6 @@
- GoogleReaderViewController
- UIViewController
-
- tapCancelButton:
- id
-
-
- tapCancelButton:
-
- tapCancelButton:
- id
-
-
-
- NewsBlurAppDelegate
- UIWebView
-
-
-
- appDelegate
- NewsBlurAppDelegate
-
-
- webView
- UIWebView
-
-
-
- IBProjectSource
- ./Classes/GoogleReaderViewController.h
-
-
-
InteractionsModule
UIView
@@ -1150,7 +1184,6 @@
FontSettingsViewController
FriendsListViewController
UINavigationController
- GoogleReaderViewController
LoginViewController
NBContainerViewController
MoveSiteViewController
@@ -1218,10 +1251,6 @@
ftuxNavigationController
UINavigationController
-
- googleReaderViewController
- GoogleReaderViewController
-
loginViewController
LoginViewController