diff --git a/media/ios/Classes/ActivityCell.m b/media/ios/Classes/ActivityCell.m index 071d2ea1d..87e444115 100644 --- a/media/ios/Classes/ActivityCell.m +++ b/media/ios/Classes/ActivityCell.m @@ -82,7 +82,8 @@ if ([category isEqualToString:@"follow"] || [category isEqualToString:@"comment_reply"] || - [category isEqualToString:@"comment_like"]) { + [category isEqualToString:@"comment_like"] || + [category isEqualToString:@"signup"]) { // this is for the rare instance when the with_user doesn't return anything if ([[activity objectForKey:@"with_user"] class] == [NSNull class]) { self.faviconView.frame = CGRectZero; @@ -110,7 +111,7 @@ if ([category isEqualToString:@"follow"]) { withUserUsername = [[activity objectForKey:@"with_user"] objectForKey:@"username"]; - txt = [NSString stringWithFormat:@"%@ followed %@.", username, withUserUsername]; + txt = [NSString stringWithFormat:@"%@ followed %@.", username, withUserUsername]; } else if ([category isEqualToString:@"comment_reply"]) { withUserUsername = [[activity objectForKey:@"with_user"] objectForKey:@"username"]; txt = [NSString stringWithFormat:@"%@ replied to %@: \n%@", username, withUserUsername, comment]; @@ -128,6 +129,8 @@ txt = [NSString stringWithFormat:@"You saved \"%@\".", content]; } else if ([category isEqualToString:@"feedsub"]) { txt = [NSString stringWithFormat:@"You subscribed to %@.", content]; + } else if ([category isEqualToString:@"signup"]) { + txt = [NSString stringWithFormat:@"You signed up for NewsBlur.", content]; } NSString *txtWithTime = [NSString stringWithFormat:@"%@\n%@", txt, time]; diff --git a/media/ios/Classes/ActivityModule.m b/media/ios/Classes/ActivityModule.m index 987e8ef60..9ea0e88fe 100644 --- a/media/ios/Classes/ActivityModule.m +++ b/media/ios/Classes/ActivityModule.m @@ -94,7 +94,7 @@ self.appDelegate = (NewsBlurAppDelegate *)[[UIApplication sharedApplication] delegate]; NSString *urlString = [NSString stringWithFormat:@ "http://%@/social/activities?user_id=%@&page=%i&limit=10" - "&category=star&category=feedsub&category=follow&category=comment_reply&category=comment_like&category=sharedstory", + "&category=signup&category=star&category=feedsub&category=follow&category=comment_reply&category=comment_like&category=sharedstory", NEWSBLUR_URL, [appDelegate.dictUserProfile objectForKey:@"user_id"], page]; @@ -210,7 +210,8 @@ NSString *category = [activitiy objectForKey:@"category"]; if ([category isEqualToString:@"follow"]) { cell.accessoryType = UITableViewCellAccessoryNone; - } else if ([category isEqualToString:@"star"]){ + } else if ([category isEqualToString:@"star"] || + [category isEqualToString:@"signup"]){ cell.accessoryType = UITableViewCellAccessoryNone; cell.selectionStyle = UITableViewCellSelectionStyleNone; } else { @@ -251,14 +252,19 @@ NSString *feedIdStr = [NSString stringWithFormat:@"%@", [[activity objectForKey:@"with_user"] objectForKey:@"id"]]; NSString *contentIdStr = [NSString stringWithFormat:@"%@", [activity objectForKey:@"content_id"]]; [appDelegate loadTryFeedDetailView:feedIdStr withStory:contentIdStr isSocial:YES withUser:[activity objectForKey:@"with_user"] showFindingStory:YES]; + appDelegate.tryFeedCategory = category; } else if ([category isEqualToString:@"sharedstory"]) { NSString *feedIdStr = [NSString stringWithFormat:@"%@", [appDelegate.dictUserProfile objectForKey:@"id"]]; NSString *contentIdStr = [NSString stringWithFormat:@"%@", [activity objectForKey:@"content_id"]]; [appDelegate loadTryFeedDetailView:feedIdStr withStory:contentIdStr isSocial:YES withUser:[activity objectForKey:@"with_user"] showFindingStory:YES]; + appDelegate.tryFeedCategory = category; + } else if ([category isEqualToString:@"feedsub"]) { NSString *feedIdStr = [NSString stringWithFormat:@"%@", [activity objectForKey:@"feed_id"]]; NSString *contentIdStr = nil; [appDelegate loadTryFeedDetailView:feedIdStr withStory:contentIdStr isSocial:NO withUser:[activity objectForKey:@"with_user"] showFindingStory:NO]; + appDelegate.tryFeedCategory = category; + } // have the selected cell deselect diff --git a/media/ios/Classes/FirstTimeUserAddFriendsViewController.m b/media/ios/Classes/FirstTimeUserAddFriendsViewController.m index 469690830..11052e818 100644 --- a/media/ios/Classes/FirstTimeUserAddFriendsViewController.m +++ b/media/ios/Classes/FirstTimeUserAddFriendsViewController.m @@ -140,8 +140,6 @@ BOOL facebookSync = [[[[results objectForKey:@"services"] objectForKey:@"facebook"] objectForKey:@"syncing"] boolValue]; BOOL twitterSync = [[[[results objectForKey:@"services"] objectForKey:@"twitter"] objectForKey:@"syncing"] boolValue]; - - if (![[[[results objectForKey:@"services"] objectForKey:@"facebook"] objectForKey:@"facebook_uid"] isKindOfClass:[NSNull class]]) { [self finishFacebookConnect]; } else { @@ -161,8 +159,9 @@ - (void)finishFacebookConnect { [self.facebookActivityIndicator stopAnimating]; - + self.friendsLabel.textColor = UIColorFromRGB(0x333333); self.facebookButton.selected = YES; + self.friendsLabel.text = @"You have successfully connected to Facebook."; UIImage *checkmark = [UIImage imageNamed:@"258-checkmark"]; UIImageView *checkmarkView = [[UIImageView alloc] initWithImage:checkmark]; checkmarkView.frame = CGRectMake(self.facebookButton.frame.origin.x + self.facebookButton.frame.size.width - 24, @@ -175,6 +174,8 @@ - (void)finishTwitterConnect { [self.twitterActivityIndicator stopAnimating]; + self.friendsLabel.textColor = UIColorFromRGB(0x333333); + self.friendsLabel.text = @"You have successfully connected to Twitter."; self.twitterButton.selected = YES; UIImage *checkmark = [UIImage imageNamed:@"258-checkmark"]; @@ -240,6 +241,7 @@ - (void)changeMessaging:(NSString *)msg { self.friendsLabel.text = msg; + self.friendsLabel.textColor = [UIColor redColor]; } @end diff --git a/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib b/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib index 0b6d18dc6..7161cbbf5 100644 --- a/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib +++ b/media/ios/Classes/FirstTimeUserAddFriendsViewController.xib @@ -45,7 +45,7 @@ {540, 540} - + _NS:9 YES 4 @@ -62,7 +62,7 @@ {{70, 49}, {400, 100}} - + _NS:9 NO YES @@ -79,6 +79,7 @@ 3 MQA + {0, 1} 0 10 5 @@ -96,7 +97,7 @@ 303 - {{70, 421}, {400, 106}} + {{121, 421}, {298, 106}} @@ -275,7 +276,7 @@ {{0, 44}, {540, 540}} - + _NS:9 3 @@ -400,9 +401,9 @@ - + @@ -897,7 +898,7 @@ NewsBlurAppDelegate - UIButton + UILabel UIBarButtonItem @@ -907,7 +908,7 @@ instructionsLabel - UIButton + UILabel nextButton @@ -922,32 +923,26 @@ FirstTimeUserAddSitesViewController UIViewController - - id - id - id - - - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - + + tapNextButton + id + + + tapNextButton + tapNextButton id - + UIActivityIndicatorView NewsBlurAppDelegate + UITableView UIButton UIView UILabel UIBarButtonItem + UIScrollView @@ -958,6 +953,10 @@ appDelegate NewsBlurAppDelegate + + categoriesTable + UITableView + googleReaderButton UIButton @@ -974,6 +973,10 @@ nextButton UIBarButtonItem + + scrollView + UIScrollView + IBProjectSource @@ -1517,6 +1520,7 @@ UIBarButtonItem UIView UISegmentedControl + UIView @@ -1547,6 +1551,10 @@ intelligenceControl UISegmentedControl + + noFocusMessage + UIView + IBProjectSource diff --git a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m index a86d6a3e6..f04c43e68 100644 --- a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m +++ b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.m @@ -29,7 +29,7 @@ // Do any additional setup after loading the view from its nib. - UIBarButtonItem *next = [[UIBarButtonItem alloc] initWithTitle:@"Start Enjoying" style:UIBarButtonSystemItemDone target:self action:@selector(tapNextButton)]; + UIBarButtonItem *next = [[UIBarButtonItem alloc] initWithTitle:@"Start reading" style:UIBarButtonSystemItemDone target:self action:@selector(tapNextButton)]; self.nextButton = next; self.navigationItem.rightBarButtonItem = next; diff --git a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib index 6ba04f6d8..09594e213 100644 --- a/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib +++ b/media/ios/Classes/FirstTimeUserAddNewsBlurViewController.xib @@ -43,7 +43,7 @@ {540, 576} - + _NS:9 YES 4 @@ -60,7 +60,7 @@ {{70, 86}, {400, 100}} - + _NS:9 NO YES @@ -77,6 +77,7 @@ 3 MQA + {0, 1} 0 10 7 @@ -139,7 +140,6 @@ {{178, 300}, {184, 34}} - _NS:9 NO IBIPadFramework @@ -167,7 +167,7 @@ {{0, 44}, {540, 576}} - + _NS:9 3 @@ -1345,6 +1345,7 @@ UIBarButtonItem UIView UISegmentedControl + UIView @@ -1375,6 +1376,10 @@ intelligenceControl UISegmentedControl + + noFocusMessage + UIView + IBProjectSource diff --git a/media/ios/Classes/FirstTimeUserAddSitesViewController.m b/media/ios/Classes/FirstTimeUserAddSitesViewController.m index d866ed779..d4f8bb2ae 100644 --- a/media/ios/Classes/FirstTimeUserAddSitesViewController.m +++ b/media/ios/Classes/FirstTimeUserAddSitesViewController.m @@ -76,7 +76,7 @@ UIActivityIndicatorView *activityView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; - activityView.frame = CGRectMake(75, 7, 20, 20.0); + activityView.frame = CGRectMake(68, 7, 20, 20.0); self.activityIndicator = activityView; } @@ -85,7 +85,7 @@ [self.categoriesTable reloadData]; [self.scrollView setContentSize:CGSizeMake(self.view.frame.size.width, self.tableViewHeight + 100)]; if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { - self.categoriesTable.frame = CGRectMake((self.view.frame.size.width - 320)/2, 60, self.categoriesTable.frame.size.width, self.tableViewHeight); + self.categoriesTable.frame = CGRectMake((self.view.frame.size.width - 300)/2, 60, self.categoriesTable.frame.size.width, self.tableViewHeight); } else { self.categoriesTable.frame = CGRectMake(10, 60, self.categoriesTable.frame.size.width, self.tableViewHeight); } @@ -162,6 +162,7 @@ self.nextButton.enabled = YES; [self.googleReaderButton setTitle:@"Importing sites..." forState:UIControlStateNormal]; + self.instructionLabel.textColor = UIColorFromRGB(0x333333); self.googleReaderButton.userInteractionEnabled = NO; self.instructionLabel.text = @"This might take a minute. Feel free to continue..."; [self.googleReaderButton addSubview:self.activityIndicator]; @@ -179,6 +180,7 @@ - (void)importFromGoogleReaderFailed:(NSString *)error { [self.googleReaderButton setTitle:@"Retry Google Reader" forState:UIControlStateNormal]; + self.instructionLabel.textColor = [UIColor redColor]; self.instructionLabel.text = error; } @@ -198,7 +200,7 @@ } - (void)updateSites { - self.instructionLabel.text = @"And just like that, we're done! Add more categories or tap Next step..."; + self.instructionLabel.text = @"And just like that, we're done!\nAdd more categories or move on..."; NSString *msg = [NSString stringWithFormat:@"Imported %i site%@", self.importedFeedCount_, self.importedFeedCount_ == 1 ? @"" : @"s"]; @@ -324,8 +326,11 @@ viewForHeaderInSection:(NSInteger)section { UIButton *headerBtn = [UIButton buttonWithType:UIButtonTypeCustom]; headerBtn.tag = section + 1000; [headerBtn setBackgroundImage:buttonImage forState:UIControlStateNormal]; - headerBtn.titleLabel.font = [UIFont systemFontOfSize:13]; + headerBtn.titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:14]; + headerBtn.frame = CGRectMake(0, 20.0, 300, 34.0); + headerBtn.titleLabel.shadowColor = UIColorFromRGB(0x1E5BDB); + headerBtn.titleLabel.shadowOffset = CGSizeMake(0, 1); NSString *categoryTitle; if (section == 0) { categoryTitle = @"Google Reader"; diff --git a/media/ios/Classes/FirstTimeUserAddSitesViewController.xib b/media/ios/Classes/FirstTimeUserAddSitesViewController.xib index 21c934c3c..a2cf3b886 100644 --- a/media/ios/Classes/FirstTimeUserAddSitesViewController.xib +++ b/media/ios/Classes/FirstTimeUserAddSitesViewController.xib @@ -83,7 +83,7 @@ 10 10 - + 303 {{70, 12}, {400, 60}} @@ -102,6 +102,11 @@ MCAwIDAAA + + 3 + MQA + + {0, 1} 0 10 2 @@ -120,7 +125,7 @@ {540, 540} - + _NS:9 YES YES @@ -179,7 +184,7 @@ instructionLabel - + 171 @@ -222,7 +227,7 @@ - + @@ -233,7 +238,7 @@ 170 - + @@ -1287,6 +1292,7 @@ UIBarButtonItem UIView UISegmentedControl + UIView @@ -1317,6 +1323,10 @@ intelligenceControl UISegmentedControl + + noFocusMessage + UIView + IBProjectSource diff --git a/media/ios/Classes/NBContainerViewController.m b/media/ios/Classes/NBContainerViewController.m index ea4a721d1..ec29820a0 100644 --- a/media/ios/Classes/NBContainerViewController.m +++ b/media/ios/Classes/NBContainerViewController.m @@ -20,7 +20,7 @@ #import "AddSiteViewController.h" #define NB_DEFAULT_MASTER_WIDTH 270 -#define NB_DEFAULT_STORY_TITLE_HEIGHT 760 +#define NB_DEFAULT_STORY_TITLE_HEIGHT 1004 #define NB_DEFAULT_SLIDER_INTERVAL 0.35 #define NB_DEFAULT_SLIDER_INTERVAL_OUT 0.35 #define NB_DEFAULT_SHARE_HEIGHT 144 @@ -72,8 +72,6 @@ self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (self) { // Custom initialization - - } return self; } @@ -121,7 +119,7 @@ self.storyTitlesOnLeft = NO; } else { self.storyTitlesYCoordinate = NB_DEFAULT_STORY_TITLE_HEIGHT; - self.storyTitlesOnLeft = NO; + self.storyTitlesOnLeft = YES; } // set up story titles stub diff --git a/media/ios/Classes/NewsBlurAppDelegate.m b/media/ios/Classes/NewsBlurAppDelegate.m index 3e19d549f..03aa61151 100644 --- a/media/ios/Classes/NewsBlurAppDelegate.m +++ b/media/ios/Classes/NewsBlurAppDelegate.m @@ -384,7 +384,7 @@ - (void)loadTryFeedDetailView:(NSString *)feedId withStory:(NSString *)contentId isSocial:(BOOL)social withUser:(NSDictionary *)user showFindingStory:(BOOL)showHUD { if (showHUD) { - [self.storyDetailViewController showFindingStoryHUD]; + [self.storyDetailViewController showShareHUD:@"Loading story"]; } if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { diff --git a/media/ios/Classes/NewsBlurViewController.h b/media/ios/Classes/NewsBlurViewController.h index 0305cf820..3668d04b3 100644 --- a/media/ios/Classes/NewsBlurViewController.h +++ b/media/ios/Classes/NewsBlurViewController.h @@ -59,6 +59,8 @@ @property (nonatomic) IBOutlet UISegmentedControl * intelligenceControl; @property (nonatomic, retain) WEPopoverController *popoverController; @property (nonatomic) NSIndexPath *currentRowAtIndexPath; +@property (strong, nonatomic) IBOutlet UIView *noFocusMessage; +@property (strong, nonatomic) IBOutlet UIBarButtonItem *toolbarLeftMargin; - (void)returnToApp; - (void)fetchFeedList:(BOOL)showLoader; diff --git a/media/ios/Classes/NewsBlurViewController.m b/media/ios/Classes/NewsBlurViewController.m index 8f714b9a6..3f9a7e74b 100644 --- a/media/ios/Classes/NewsBlurViewController.m +++ b/media/ios/Classes/NewsBlurViewController.m @@ -52,6 +52,8 @@ @synthesize imageCache; @synthesize popoverController; @synthesize currentRowAtIndexPath; +@synthesize noFocusMessage; +@synthesize toolbarLeftMargin; @synthesize hasNoSites; @synthesize updatedDictFeeds_; @synthesize updatedDictSocialFeeds_; @@ -83,9 +85,11 @@ imageCache = [[NSCache alloc] init]; [imageCache setDelegate:self]; - [self.intelligenceControl setWidth:45 forSegmentAtIndex:0]; - [self.intelligenceControl setWidth:70 forSegmentAtIndex:1]; - [self.intelligenceControl setWidth:65 forSegmentAtIndex:2]; + [self.intelligenceControl setWidth:50 forSegmentAtIndex:0]; + [self.intelligenceControl setWidth:68 forSegmentAtIndex:1]; + [self.intelligenceControl setWidth:62 forSegmentAtIndex:2]; + self.intelligenceControl.hidden = YES; + } @@ -170,6 +174,7 @@ [super viewDidAppear:animated]; [self performSelector:@selector(fadeSelectedCell) withObject:self afterDelay:0.6]; + self.navigationController.navigationBar.backItem.title = @"All Sites"; } - (void)fadeSelectedCell { @@ -220,6 +225,8 @@ } - (void)viewDidUnload { + [self setToolbarLeftMargin:nil]; + [self setNoFocusMessage:nil]; [self setInnerView:nil]; // Release any retained subviews of the main view. // e.g. self.myOutlet = nil; @@ -472,6 +479,31 @@ [appDelegate showFirstTimeUser]; return; } + + BOOL hasFocusStory = NO; + for (id feedId in appDelegate.dictFeeds) { + NSDictionary *feed = [appDelegate.dictFeeds objectForKey:feedId]; + if ([[feed objectForKey:@"ps"] intValue] > 0) { + hasFocusStory = YES; + break; + } + } + + if (!hasFocusStory) { + [self.intelligenceControl removeSegmentAtIndex:2 animated:NO]; + [self.intelligenceControl setWidth:90 forSegmentAtIndex:0]; + [self.intelligenceControl setWidth:90 forSegmentAtIndex:1]; + } else { + UIImage *green = [UIImage imageNamed:@"green_focus.png"]; + if (self.intelligenceControl.numberOfSegments == 2) { + [self.intelligenceControl insertSegmentWithImage:green atIndex:2 animated:NO]; + [self.intelligenceControl setWidth:50 forSegmentAtIndex:0]; + [self.intelligenceControl setWidth:68 forSegmentAtIndex:1]; + [self.intelligenceControl setWidth:62 forSegmentAtIndex:2]; + } + } + + self.intelligenceControl.hidden = NO; } - (void)showUserProfile { @@ -638,6 +670,7 @@ return cell; } + NSDictionary *feed; @@ -1005,6 +1038,7 @@ } [hud hide:YES afterDelay:0.75]; + // [self.feedTitlesTable reloadData]; } diff --git a/media/ios/Classes/ShareViewController.m b/media/ios/Classes/ShareViewController.m index 256ac1135..0f540aa98 100644 --- a/media/ios/Classes/ShareViewController.m +++ b/media/ios/Classes/ShareViewController.m @@ -221,7 +221,7 @@ # pragma mark Share Story - (IBAction)doShareThisStory:(id)sender { - [appDelegate.storyDetailViewController showShareHUD]; + [appDelegate.storyDetailViewController showShareHUD:@"Sharing"]; NSString *urlString = [NSString stringWithFormat:@"http://%@/social/share_story", NEWSBLUR_URL]; @@ -279,7 +279,7 @@ # pragma mark Reply to Story - (IBAction)doReplyToComment:(id)sender { - [appDelegate.storyDetailViewController showShareHUD]; + [appDelegate.storyDetailViewController showShareHUD:@"Replying"]; NSString *comments = commentField.text; if ([comments length] == 0) { return; @@ -308,7 +308,7 @@ [request setDidFailSelector:@selector(requestFailed:)]; [request startAsynchronous]; [appDelegate hideShareView:YES]; - [appDelegate.storyDetailViewController showShareHUD]; + [appDelegate.storyDetailViewController showShareHUD:@"Replying"]; } - (void)finishAddReply:(ASIHTTPRequest *)request { diff --git a/media/ios/Classes/StoryDetailViewController.h b/media/ios/Classes/StoryDetailViewController.h index 8c4d6abed..33b09790e 100644 --- a/media/ios/Classes/StoryDetailViewController.h +++ b/media/ios/Classes/StoryDetailViewController.h @@ -70,9 +70,7 @@ - (void)initStory; - (void)clearStory; -- (void)showShareHUD; -- (void)showFollowingHUD; -- (void)showFindingStoryHUD; +- (void)showShareHUD:(NSString *)msg; - (void)refreshComments:(NSString *)replyId; - (void)finishMarkAsRead:(ASIHTTPRequest *)request; - (void)finishLikeComment:(ASIHTTPRequest *)request; diff --git a/media/ios/Classes/StoryDetailViewController.m b/media/ios/Classes/StoryDetailViewController.m index 7bb942639..34125cc0d 100644 --- a/media/ios/Classes/StoryDetailViewController.m +++ b/media/ios/Classes/StoryDetailViewController.m @@ -117,7 +117,7 @@ // back button UIBarButtonItem *backButton = [[UIBarButtonItem alloc] - initWithTitle:@"Back" style:UIBarButtonItemStyleBordered target:self action:@selector(transitionFromFeedDetail)]; + initWithTitle:@"All Sites" style:UIBarButtonItemStyleBordered target:self action:@selector(transitionFromFeedDetail)]; self.buttonBack = backButton; // loading indicator @@ -1162,7 +1162,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request } - (void)toggleLikeComment:(BOOL)likeComment { - [self showShareHUD]; + [self showShareHUD:@"Favoriting"]; NSString *urlString; if (likeComment) { urlString = [NSString stringWithFormat:@"http://%@/social/like_comment", @@ -1241,7 +1241,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request # pragma mark Subscribing to blurblog - (void)subscribeToBlurblog { - [self showFollowingHUD]; + [self showShareHUD:@"Following"]; NSString *urlString = [NSString stringWithFormat:@"http://%@/social/follow", NEWSBLUR_URL]; @@ -1270,24 +1270,10 @@ shouldStartLoadWithRequest:(NSURLRequest *)request // [appDelegate.feedDetailViewController fetchFeedDetail:1 withCallback:nil]; } -- (void)showShareHUD { +- (void)showShareHUD:(NSString *)msg { [MBProgressHUD hideHUDForView:self.view animated:NO]; self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; - self.storyHUD.labelText = @"Sharing"; - self.storyHUD.margin = 20.0f; -} - -- (void)showFollowingHUD { - [MBProgressHUD hideHUDForView:self.view animated:NO]; - self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; - self.storyHUD.labelText = @"Following"; - self.storyHUD.margin = 20.0f; -} - -- (void)showFindingStoryHUD { - [MBProgressHUD hideHUDForView:self.view animated:NO]; - self.storyHUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; - self.storyHUD.labelText = @"Loading Story"; + self.storyHUD.labelText = msg; self.storyHUD.margin = 20.0f; self.noStorySelectedLabel.hidden = YES; } diff --git a/media/ios/NewsBlur.xcodeproj/project.pbxproj b/media/ios/NewsBlur.xcodeproj/project.pbxproj index d22a393c6..bf92c3357 100755 --- a/media/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/media/ios/NewsBlur.xcodeproj/project.pbxproj @@ -372,7 +372,7 @@ 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D3623240D0F684500981E51 /* NewsBlurAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = NewsBlurAppDelegate.h; path = Classes/NewsBlurAppDelegate.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1D3623250D0F684500981E51 /* NewsBlurAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = NewsBlurAppDelegate.m; path = Classes/NewsBlurAppDelegate.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - 1D6058910D05DD3D006BFB54 /* NewsBlur Pro.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "NewsBlur Pro.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D6058910D05DD3D006BFB54 /* NewsBlur.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NewsBlur.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 28D7ACF60DDB3853001CB0EB /* NewsBlurViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewsBlurViewController.h; sourceTree = ""; }; @@ -931,7 +931,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 1D6058910D05DD3D006BFB54 /* NewsBlur Pro.app */, + 1D6058910D05DD3D006BFB54 /* NewsBlur.app */, ); name = Products; sourceTree = ""; @@ -1851,7 +1851,7 @@ ); name = NewsBlur; productName = NewsBlur; - productReference = 1D6058910D05DD3D006BFB54 /* NewsBlur Pro.app */; + productReference = 1D6058910D05DD3D006BFB54 /* NewsBlur.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -2282,7 +2282,7 @@ "-all_load", "-ObjC", ); - PRODUCT_NAME = "NewsBlur Pro"; + PRODUCT_NAME = NewsBlur; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2319,7 +2319,7 @@ "-ObjC", "-all_load", ); - PRODUCT_NAME = "NewsBlur Pro"; + PRODUCT_NAME = NewsBlur; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/media/ios/Resources-iPhone/NewsBlurViewController.xib b/media/ios/Resources-iPhone/NewsBlurViewController.xib index 8ea03d027..977ec078a 100644 --- a/media/ios/Resources-iPhone/NewsBlurViewController.xib +++ b/media/ios/Resources-iPhone/NewsBlurViewController.xib @@ -92,10 +92,9 @@ 292 - {{70, 8}, {180, 30}} + {{61, 8}, {180, 30}} - IBCocoaTouchFramework 2 3 @@ -163,6 +162,11 @@ 5 + + IBCocoaTouchFramework + + 5 + IBCocoaTouchFramework @@ -309,8 +313,8 @@ YES - + @@ -337,6 +341,7 @@ + @@ -360,16 +365,21 @@ - - 25 - - - 55 + + 104 + + + + + 105 + + + @@ -380,8 +390,9 @@ -1.IBPluginDependency -2.CustomClassName -2.IBPluginDependency + 104.IBPluginDependency + 105.IBPluginDependency 11.IBPluginDependency - 25.IBPluginDependency 55.IBPluginDependency 55.IUISegmentedControlInspectorSelectedSegmentMetadataKey 56.IBPluginDependency @@ -400,6 +411,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -421,7 +433,7 @@ - 95 + 105 @@ -948,10 +960,10 @@ YES YES - tapCategoryButton: - tapGoogleReaderButton - tapNewsBlurButton: + tapFacebookButton tapNextButton + tapTwitterButton + toggleAutoFollowFriends: YES @@ -965,124 +977,96 @@ YES YES - tapCategoryButton: - tapGoogleReaderButton - tapNewsBlurButton: + tapFacebookButton tapNextButton + tapTwitterButton + toggleAutoFollowFriends: YES - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: + tapFacebookButton id tapNextButton id + + tapTwitterButton + id + + + toggleAutoFollowFriends: + id + YES YES - addFriendsView - addNewsBlurView - addSitesView appDelegate - googleReaderButton - logo + facebookActivityIndicator + facebookButton + friendsLabel nextButton - previousButton - toolbar - toolbarTitle - welcomeView + twitterActivityIndicator + twitterButton YES - UIView - UIView - UIView NewsBlurAppDelegate + UIActivityIndicatorView UIButton - UIImageView + UILabel UIBarButtonItem - UIBarButtonItem - UIToolbar + UIActivityIndicatorView UIButton - UIView YES YES - addFriendsView - addNewsBlurView - addSitesView appDelegate - googleReaderButton - logo + facebookActivityIndicator + facebookButton + friendsLabel nextButton - previousButton - toolbar - toolbarTitle - welcomeView + twitterActivityIndicator + twitterButton YES - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - appDelegate NewsBlurAppDelegate - googleReaderButton + facebookActivityIndicator + UIActivityIndicatorView + + + facebookButton UIButton - logo - UIImageView + friendsLabel + UILabel nextButton UIBarButtonItem - previousButton - UIBarButtonItem + twitterActivityIndicator + UIActivityIndicatorView - toolbar - UIToolbar - - - toolbarTitle + twitterButton UIButton - - welcomeView - UIView - @@ -1097,38 +1081,27 @@ YES YES - tapCategoryButton: - tapGoogleReaderButton tapNewsBlurButton: tapNextButton + tapPopularButton: YES id id id - id YES YES - tapCategoryButton: - tapGoogleReaderButton tapNewsBlurButton: tapNextButton + tapPopularButton: YES - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - tapNewsBlurButton: id @@ -1137,101 +1110,49 @@ tapNextButton id + + tapPopularButton: + id + YES YES - addFriendsView - addNewsBlurView - addSitesView appDelegate - googleReaderButton - logo + instructionsLabel nextButton - previousButton - toolbar - toolbarTitle - welcomeView YES - UIView - UIView - UIView NewsBlurAppDelegate - UIButton - UIImageView + UILabel UIBarButtonItem - UIBarButtonItem - UIToolbar - UIButton - UIView YES YES - addFriendsView - addNewsBlurView - addSitesView appDelegate - googleReaderButton - logo + instructionsLabel nextButton - previousButton - toolbar - toolbarTitle - welcomeView YES - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - appDelegate NewsBlurAppDelegate - googleReaderButton - UIButton - - - logo - UIImageView + instructionsLabel + UILabel nextButton UIBarButtonItem - - previousButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView - @@ -1243,143 +1164,87 @@ FirstTimeUserAddSitesViewController UIViewController - YES - - YES - tapCategoryButton: - tapGoogleReaderButton - tapNewsBlurButton: - tapNextButton - - - YES - id - id - id - id - + tapNextButton + id - YES - - YES - tapCategoryButton: - tapGoogleReaderButton - tapNewsBlurButton: - tapNextButton - - - YES - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: - id - - - tapNextButton - id - + tapNextButton + + tapNextButton + id YES YES - addFriendsView - addNewsBlurView - addSitesView + activityIndicator appDelegate + categoriesTable googleReaderButton - logo + googleReaderButtonWrapper + instructionLabel nextButton - previousButton - toolbar - toolbarTitle - welcomeView + scrollView YES - UIView - UIView - UIView + UIActivityIndicatorView NewsBlurAppDelegate - UIButton - UIImageView - UIBarButtonItem - UIBarButtonItem - UIToolbar + UITableView UIButton UIView + UILabel + UIBarButtonItem + UIScrollView YES YES - addFriendsView - addNewsBlurView - addSitesView + activityIndicator appDelegate + categoriesTable googleReaderButton - logo + googleReaderButtonWrapper + instructionLabel nextButton - previousButton - toolbar - toolbarTitle - welcomeView + scrollView YES - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView + activityIndicator + UIActivityIndicatorView appDelegate NewsBlurAppDelegate + + categoriesTable + UITableView + googleReaderButton UIButton - logo - UIImageView + googleReaderButtonWrapper + UIView + + + instructionLabel + UILabel nextButton UIBarButtonItem - previousButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView + scrollView + UIScrollView @@ -1407,12 +1272,16 @@ YES appDelegate + footer + header logo nextButton YES NewsBlurAppDelegate + UILabel + UILabel UIImageView UIBarButtonItem @@ -1422,6 +1291,8 @@ YES appDelegate + footer + header logo nextButton @@ -1431,6 +1302,14 @@ appDelegate NewsBlurAppDelegate + + footer + UILabel + + + header + UILabel + logo UIImageView @@ -1586,57 +1465,6 @@ ./Classes/FriendsListViewController.h - - GoogleReaderViewController - UIViewController - - tapCancelButton: - id - - - tapCancelButton: - - tapCancelButton: - id - - - - YES - - YES - appDelegate - webView - - - YES - NewsBlurAppDelegate - UIWebView - - - - YES - - YES - appDelegate - webView - - - YES - - appDelegate - NewsBlurAppDelegate - - - webView - UIWebView - - - - - IBProjectSource - ./Classes/GoogleReaderViewController.h - - InteractionsModule UIView @@ -2032,7 +1860,6 @@ fontSettingsViewController friendsListViewController ftuxNavigationController - googleReaderViewController loginViewController masterContainerViewController moveSiteViewController @@ -2059,7 +1886,6 @@ FontSettingsViewController FriendsListViewController UINavigationController - GoogleReaderViewController LoginViewController NBContainerViewController MoveSiteViewController @@ -2089,7 +1915,6 @@ fontSettingsViewController friendsListViewController ftuxNavigationController - googleReaderViewController loginViewController masterContainerViewController moveSiteViewController @@ -2158,10 +1983,6 @@ ftuxNavigationController UINavigationController - - googleReaderViewController - GoogleReaderViewController - loginViewController LoginViewController @@ -2272,6 +2093,8 @@ homeButton innerView intelligenceControl + noFocusMessage + toolbarLeftMargin YES @@ -2282,6 +2105,8 @@ UIBarButtonItem UIView UISegmentedControl + UIView + UIBarButtonItem @@ -2295,6 +2120,8 @@ homeButton innerView intelligenceControl + noFocusMessage + toolbarLeftMargin YES @@ -2326,6 +2153,14 @@ intelligenceControl UISegmentedControl + + noFocusMessage + UIView + + + toolbarLeftMargin + UIBarButtonItem +