diff --git a/media/ios/Classes/ShareViewController.m b/media/ios/Classes/ShareViewController.m index 647edd8b3..fa29be167 100644 --- a/media/ios/Classes/ShareViewController.m +++ b/media/ios/Classes/ShareViewController.m @@ -468,9 +468,11 @@ } else { self.submitButton.title = @"Share this story"; } + } else if ([self.currentType isEqualToString: @"reply"] || + [self.currentType isEqualToString:@"edit-reply"]) { + self.submitButton.enabled = [self.commentField.text length] > 0; } - } @end diff --git a/media/ios/Classes/ShareViewController~ipad.xib b/media/ios/Classes/ShareViewController~ipad.xib index e57860f8a..9071c2e35 100644 --- a/media/ios/Classes/ShareViewController~ipad.xib +++ b/media/ios/Classes/ShareViewController~ipad.xib @@ -41,7 +41,6 @@ 303 {{20, 15}, {664, 39}} - _NS:9 1 @@ -71,7 +70,6 @@ 265 {{580, 62}, {48, 36}} - _NS:9 NO @@ -122,7 +120,6 @@ 265 {{524, 62}, {48, 36}} - _NS:9 NO @@ -157,7 +154,6 @@ 265 {{636, 62}, {48, 36}} - _NS:9 NO 2 @@ -189,8 +185,6 @@ {704, 100} - - 2 MC45MDk4MDM5ODY1IDAuOTE3NjQ3MTIzMyAwLjg5NDExNzcxMwA @@ -348,1587 +342,7 @@ 59 - - - - ActivityModule - UIView - - IBProjectSource - ./Classes/ActivityModule.h - - - - AddSiteViewController - UIViewController - - id - id - id - id - id - id - - - - addFolder - id - - - addSite - id - - - checkSiteAddress - id - - - doAddButton - id - - - doCancelButton - id - - - selectAddTypeSignup - id - - - - UIActivityIndicatorView - UIBarButtonItem - UITextField - UISegmentedControl - UILabel - NewsBlurAppDelegate - UIBarButtonItem - UILabel - UIPickerView - UITextField - UINavigationBar - UIActivityIndicatorView - UITextField - UIScrollView - UITableView - - - - activityIndicator - UIActivityIndicatorView - - - addButton - UIBarButtonItem - - - addFolderInput - UITextField - - - addTypeControl - UISegmentedControl - - - addingLabel - UILabel - - - appDelegate - NewsBlurAppDelegate - - - cancelButton - UIBarButtonItem - - - errorLabel - UILabel - - - folderPicker - UIPickerView - - - inFolderInput - UITextField - - - navBar - UINavigationBar - - - siteActivityIndicator - UIActivityIndicatorView - - - siteAddressInput - UITextField - - - siteScrollView - UIScrollView - - - siteTable - UITableView - - - - IBProjectSource - ./Classes/AddSiteViewController.h - - - - BaseViewController - UIViewController - - IBProjectSource - ./Classes/BaseViewController.h - - - - DashboardViewController - UIViewController - - id - id - - - - doLogout: - id - - - tapSegmentedButton: - id - - - - ActivityModule - NewsBlurAppDelegate - UIWebView - InteractionsModule - UISegmentedControl - UIToolbar - UIToolbar - - - - activitiesModule - ActivityModule - - - appDelegate - NewsBlurAppDelegate - - - feedbackWebView - UIWebView - - - interactionsModule - InteractionsModule - - - segmentedButton - UISegmentedControl - - - toolbar - UIToolbar - - - topToolbar - UIToolbar - - - - IBProjectSource - ./Classes/DashboardViewController.h - - - - FeedDetailMenuViewController - UIViewController - - id - id - - - - changeOrder: - id - - - changeReadFilter: - id - - - - NewsBlurAppDelegate - UITableView - UISegmentedControl - UISegmentedControl - - - - appDelegate - NewsBlurAppDelegate - - - menuTableView - UITableView - - - orderSegmentedControl - UISegmentedControl - - - readFilterSegmentedControl - UISegmentedControl - - - - IBProjectSource - ./Classes/FeedDetailMenuViewController.h - - - - FeedDetailViewController - BaseViewController - - id - id - - - - doOpenMarkReadActionSheet: - id - - - doOpenSettingsActionSheet: - id - - - - NewsBlurAppDelegate - UIBarButtonItem - TransparentToolbar - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - feedMarkReadButton - UIBarButtonItem - - - rightToolbar - TransparentToolbar - - - separatorBarButton - UIBarButtonItem - - - settingsBarButton - UIBarButtonItem - - - spacer2BarButton - UIBarButtonItem - - - spacer3BarButton - UIBarButtonItem - - - spacerBarButton - UIBarButtonItem - - - storyTitlesTable - UITableView - - - - IBProjectSource - ./Classes/FeedDetailViewController.h - - - - FeedsMenuViewController - UIViewController - - NewsBlurAppDelegate - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - menuTableView - UITableView - - - - IBProjectSource - ./Classes/FeedsMenuViewController.h - - - - FindSitesViewController - UIViewController - - NewsBlurAppDelegate - UISearchBar - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - sitesSearchBar - UISearchBar - - - sitesTable - UITableView - - - - IBProjectSource - ./Classes/FindSitesViewController.h - - - - FirstTimeUserAddFriendsViewController - UIViewController - - id - id - id - id - - - - tapFacebookButton - id - - - tapNextButton - id - - - tapTwitterButton - id - - - toggleAutoFollowFriends: - id - - - - NewsBlurAppDelegate - UIActivityIndicatorView - UIButton - UILabel - UIBarButtonItem - UIActivityIndicatorView - UIButton - - - - appDelegate - NewsBlurAppDelegate - - - facebookActivityIndicator - UIActivityIndicatorView - - - facebookButton - UIButton - - - friendsLabel - UILabel - - - nextButton - UIBarButtonItem - - - twitterActivityIndicator - UIActivityIndicatorView - - - twitterButton - UIButton - - - - IBProjectSource - ./Classes/FirstTimeUserAddFriendsViewController.h - - - - FirstTimeUserAddNewsBlurViewController - UIViewController - - id - id - id - - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - tapPopularButton: - id - - - - NewsBlurAppDelegate - UILabel - UIBarButtonItem - - - - appDelegate - NewsBlurAppDelegate - - - instructionsLabel - UILabel - - - nextButton - UIBarButtonItem - - - - IBProjectSource - ./Classes/FirstTimeUserAddNewsBlurViewController.h - - - - FirstTimeUserAddSitesViewController - UIViewController - - tapNextButton - id - - - tapNextButton - - tapNextButton - id - - - - UIActivityIndicatorView - NewsBlurAppDelegate - UITableView - UIButton - UIView - UILabel - UIBarButtonItem - UIScrollView - - - - activityIndicator - UIActivityIndicatorView - - - appDelegate - NewsBlurAppDelegate - - - categoriesTable - UITableView - - - googleReaderButton - UIButton - - - googleReaderButtonWrapper - UIView - - - instructionLabel - UILabel - - - nextButton - UIBarButtonItem - - - scrollView - UIScrollView - - - - IBProjectSource - ./Classes/FirstTimeUserAddSitesViewController.h - - - - FirstTimeUserViewController - UIViewController - - tapNextButton - id - - - tapNextButton - - tapNextButton - id - - - - NewsBlurAppDelegate - UILabel - UILabel - UIImageView - UIBarButtonItem - - - - appDelegate - NewsBlurAppDelegate - - - footer - UILabel - - - header - UILabel - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - - IBProjectSource - ./Classes/FirstTimeUserViewController.h - - - - FontSettingsViewController - UIViewController - - id - id - - - - changeFontSize: - id - - - changeFontStyle: - id - - - - NewsBlurAppDelegate - UISegmentedControl - UISegmentedControl - UILabel - UITableView - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - fontSizeSegment - UISegmentedControl - - - fontStyleSegment - UISegmentedControl - - - largeFontSizeLabel - UILabel - - - menuTableView - UITableView - - - smallFontSizeLabel - UILabel - - - - IBProjectSource - ./Classes/FontSettingsViewController.h - - - - FriendsListViewController - UIViewController - - NewsBlurAppDelegate - UISearchBar - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - friendSearchBar - UISearchBar - - - friendsTable - UITableView - - - - IBProjectSource - ./Classes/FriendsListViewController.h - - - - InteractionsModule - UIView - - IBProjectSource - ./Classes/InteractionsModule.h - - - - LoginViewController - UIViewController - - id - id - id - id - id - - - - selectLogin - id - - - selectLoginSignup - id - - - selectSignUp - id - - - tapLoginButton - id - - - tapSignUpButton - id - - - - NewsBlurAppDelegate - UITextField - UILabel - UILabel - UIView - UISegmentedControl - UITextField - UILabel - UILabel - UIButton - UIButton - UITextField - UITextField - UIView - UITextField - UILabel - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - emailInput - UITextField - - - emailLabel - UILabel - - - errorLabel - UILabel - - - logInView - UIView - - - loginControl - UISegmentedControl - - - passwordInput - UITextField - - - passwordLabel - UILabel - - - passwordOptionalLabel - UILabel - - - selectLoginButton - UIButton - - - selectSignUpButton - UIButton - - - signUpPasswordInput - UITextField - - - signUpUsernameInput - UITextField - - - signUpView - UIView - - - usernameInput - UITextField - - - usernameLabel - UILabel - - - usernameOrEmailLabel - UILabel - - - - IBProjectSource - ./Classes/LoginViewController.h - - - - MoveSiteViewController - UIViewController - - id - id - id - id - - - - doCancelButton - id - - - doMoveButton - id - - - moveFolder - id - - - moveSite - id - - - - UIActivityIndicatorView - NewsBlurAppDelegate - UIBarButtonItem - UILabel - UIPickerView - UITextField - UIBarButtonItem - UILabel - UINavigationBar - UILabel - UITextField - - - - activityIndicator - UIActivityIndicatorView - - - appDelegate - NewsBlurAppDelegate - - - cancelButton - UIBarButtonItem - - - errorLabel - UILabel - - - folderPicker - UIPickerView - - - fromFolderInput - UITextField - - - moveButton - UIBarButtonItem - - - movingLabel - UILabel - - - navBar - UINavigationBar - - - titleLabel - UILabel - - - toFolderInput - UITextField - - - - IBProjectSource - ./Classes/MoveSiteViewController.h - - - - NBContainerViewController - UIViewController - - appDelegate - NewsBlurAppDelegate - - - appDelegate - - appDelegate - NewsBlurAppDelegate - - - - IBProjectSource - ./Classes/NBContainerViewController.h - - - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - - - NewsBlurAppDelegate - BaseViewController - - AddSiteViewController - DashboardViewController - FeedDashboardViewController - FeedDetailMenuViewController - FeedDetailViewController - FeedsMenuViewController - NewsBlurViewController - FindSitesViewController - FirstTimeUserAddFriendsViewController - FirstTimeUserAddNewsBlurViewController - FirstTimeUserAddSitesViewController - FirstTimeUserViewController - FontSettingsViewController - FriendsListViewController - UINavigationController - LoginViewController - NBContainerViewController - MoveSiteViewController - UINavigationController - OriginalStoryViewController - ShareViewController - StoryDetailViewController - StoryPageControl - TrainerViewController - UserProfileViewController - UIWindow - - - - addSiteViewController - AddSiteViewController - - - dashboardViewController - DashboardViewController - - - feedDashboardViewController - FeedDashboardViewController - - - feedDetailMenuViewController - FeedDetailMenuViewController - - - feedDetailViewController - FeedDetailViewController - - - feedsMenuViewController - FeedsMenuViewController - - - feedsViewController - NewsBlurViewController - - - findSitesViewController - FindSitesViewController - - - firstTimeUserAddFriendsViewController - FirstTimeUserAddFriendsViewController - - - firstTimeUserAddNewsBlurViewController - FirstTimeUserAddNewsBlurViewController - - - firstTimeUserAddSitesViewController - FirstTimeUserAddSitesViewController - - - firstTimeUserViewController - FirstTimeUserViewController - - - fontSettingsViewController - FontSettingsViewController - - - friendsListViewController - FriendsListViewController - - - ftuxNavigationController - UINavigationController - - - loginViewController - LoginViewController - - - masterContainerViewController - NBContainerViewController - - - moveSiteViewController - MoveSiteViewController - - - navigationController - UINavigationController - - - originalStoryViewController - OriginalStoryViewController - - - shareViewController - ShareViewController - - - storyDetailViewController - StoryDetailViewController - - - storyPageControl - StoryPageControl - - - trainerViewController - TrainerViewController - - - userProfileViewController - UserProfileViewController - - - window - UIWindow - - - - IBProjectSource - ./Classes/NewsBlurAppDelegate.h - - - - NewsBlurViewController - BaseViewController - - UIButton - UIButton - UIButton - id - id - id - id - - - - sectionTapped: - UIButton - - - sectionUntapped: - UIButton - - - sectionUntappedOutside: - UIButton - - - selectIntelligence - id - - - showInteractionsPopover: - id - - - showSettingsPopover: - id - - - tapAddSite: - id - - - - UIBarButtonItem - UIBarButtonItem - NewsBlurAppDelegate - UISlider - UITableView - UIToolbar - UIBarButtonItem - UIView - UISegmentedControl - UIView - UIBarButtonItem - UIBarButtonItem - - - - activitiesButton - UIBarButtonItem - - - addBarButton - UIBarButtonItem - - - appDelegate - NewsBlurAppDelegate - - - feedScoreSlider - UISlider - - - feedTitlesTable - UITableView - - - feedViewToolbar - UIToolbar - - - homeButton - UIBarButtonItem - - - innerView - UIView - - - intelligenceControl - UISegmentedControl - - - noFocusMessage - UIView - - - settingsBarButton - UIBarButtonItem - - - toolbarLeftMargin - UIBarButtonItem - - - - IBProjectSource - ./Classes/NewsBlurViewController.h - - - - OriginalStoryViewController - BaseViewController - - id - id - id - - - - doCloseOriginalStoryViewController - id - - - doOpenActionSheet - id - - - loadAddress: - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UILabel - UITextField - UIBarButtonItem - UIToolbar - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - back - UIBarButtonItem - - - closeButton - UIBarButtonItem - - - forward - UIBarButtonItem - - - pageAction - UIBarButtonItem - - - pageTitle - UILabel - - - pageUrl - UITextField - - - refresh - UIBarButtonItem - - - toolbar - UIToolbar - - - webView - UIWebView - - - - IBProjectSource - ./Classes/OriginalStoryViewController.h - - - - ShareViewController - UIViewController - - id - id - id - id - - - - doCancelButton: - id - - - doReplyToComment: - id - - - doShareThisStory: - id - - - doToggleButton: - id - - - - NewsBlurAppDelegate - UIButton - UITextView - UIButton - NSLayoutConstraint - UILabel - UIBarButtonItem - UIButton - - - - appDelegate - NewsBlurAppDelegate - - - appdotnetButton - UIButton - - - commentField - UITextView - - - facebookButton - UIButton - - - keyboardHeight - NSLayoutConstraint - - - storyTitle - UILabel - - - submitButton - UIBarButtonItem - - - twitterButton - UIButton - - - - IBProjectSource - ./Classes/ShareViewController.h - - - - StoryDetailViewController - BaseViewController - - NewsBlurAppDelegate - UIView - UIView - UILabel - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - feedTitleGradient - UIView - - - innerView - UIView - - - noStorySelectedLabel - UILabel - - - webView - UIWebView - - - - IBProjectSource - ./Classes/StoryDetailViewController.h - - - - StoryPageControl - BaseViewController - - id - id - id - id - id - - - - doNextUnreadStory - id - - - doPreviousStory - id - - - showOriginalSubview: - id - - - tapProgressBar: - id - - - toggleFontSize: - id - - - - UIBarButtonItem - NewsBlurAppDelegate - UIToolbar - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIPageControl - UIProgressView - UIView - TransparentToolbar - UIScrollView - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIToolbar - - - - activity - UIBarButtonItem - - - appDelegate - NewsBlurAppDelegate - - - bottomPlaceholderToolbar - UIToolbar - - - buttonAction - UIBarButtonItem - - - buttonNext - UIBarButtonItem - - - buttonPrevious - UIBarButtonItem - - - fontSettingsButton - UIBarButtonItem - - - originalStoryButton - UIBarButtonItem - - - pageControl - UIPageControl - - - progressView - UIProgressView - - - progressViewContainer - UIView - - - rightToolbar - TransparentToolbar - - - scrollView - UIScrollView - - - separatorBarButton - UIBarButtonItem - - - spacer2BarButton - UIBarButtonItem - - - spacer3BarButton - UIBarButtonItem - - - spacerBarButton - UIBarButtonItem - - - subscribeButton - UIBarButtonItem - - - toolbar - UIToolbar - - - - IBProjectSource - ./Classes/StoryPageControl.h - - - - TrainerViewController - BaseViewController - - doCloseDialog: - id - - - doCloseDialog: - - doCloseDialog: - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UINavigationBar - TrainerWebView - - - - appDelegate - NewsBlurAppDelegate - - - closeButton - UIBarButtonItem - - - navBar - UINavigationBar - - - webView - TrainerWebView - - - - IBProjectSource - ./Classes/TrainerViewController.h - - - - TrainerWebView - UIWebView - - IBProjectSource - ./Classes/TrainerWebView.h - - - - TransparentToolbar - UIToolbar - - IBProjectSource - ./Classes/TransparentToolbar.h - - - - UserProfileViewController - UIViewController - - IBProjectSource - ./Classes/UserProfileViewController.h - - - - + 0 IBIPadFramework diff --git a/media/ios/Classes/StoryDetailViewController.m b/media/ios/Classes/StoryDetailViewController.m index fa33ad103..545d05b2e 100644 --- a/media/ios/Classes/StoryDetailViewController.m +++ b/media/ios/Classes/StoryDetailViewController.m @@ -206,7 +206,7 @@ footerString ]; - NSLog(@"\n\n\n\nhtmlString:\n\n\n%@\n\n\n", htmlString); +// NSLog(@"\n\n\n\nhtmlString:\n\n\n%@\n\n\n", htmlString); NSString *path = [[NSBundle mainBundle] bundlePath]; NSURL *baseURL = [NSURL fileURLWithPath:path]; @@ -373,26 +373,28 @@ - (NSString *)getComments { NSString *comments = @"
"; - if ([self.activeStory objectForKey:@"share_count"] != [NSNull null] && - [[self.activeStory objectForKey:@"share_count"] intValue] > 0) { + if ([self.activeStory objectForKey:@"comment_count"] != [NSNull null] && + [[self.activeStory objectForKey:@"comment_count"] intValue] > 0) { NSDictionary *story = self.activeStory; NSArray *friendsCommentsArray = [story objectForKey:@"friend_comments"]; NSArray *publicCommentsArray = [story objectForKey:@"public_comments"]; - NSString *commentHeader = [NSString stringWithFormat:@ - "
" - "
%i comment%@
" - "
", - [[story objectForKey:@"comment_count_friends"] intValue], - [[story objectForKey:@"comment_count_friends"] intValue] == 1 ? @"" : @"s"]; - - comments = [comments stringByAppendingString:commentHeader]; - // add friends comments - for (int i = 0; i < friendsCommentsArray.count; i++) { - NSString *comment = [self getComment:[friendsCommentsArray objectAtIndex:i]]; - comments = [comments stringByAppendingString:comment]; - } + if ([[story objectForKey:@"comment_count_friends"] intValue] > 0 ) { + NSString *commentHeader = [NSString stringWithFormat:@ + "
" + "
%i comment%@
" + "
", + [[story objectForKey:@"comment_count_friends"] intValue], + [[story objectForKey:@"comment_count_friends"] intValue] == 1 ? @"" : @"s"]; + comments = [comments stringByAppendingString:commentHeader]; + + // add friends comments + for (int i = 0; i < friendsCommentsArray.count; i++) { + NSString *comment = [self getComment:[friendsCommentsArray objectAtIndex:i]]; + comments = [comments stringByAppendingString:comment]; + } + } if ([[story objectForKey:@"comment_count_public"] intValue] > 0 ) { NSString *publicCommentHeader = [NSString stringWithFormat:@ @@ -405,6 +407,7 @@ comments = [comments stringByAppendingString:@"
"]; comments = [comments stringByAppendingString:publicCommentHeader]; comments = [comments stringByAppendingFormat:@"
"]; + // add public comments for (int i = 0; i < publicCommentsArray.count; i++) { NSString *comment = [self getComment:[publicCommentsArray objectAtIndex:i]]; diff --git a/media/ios/Classes/StoryPageControl.h b/media/ios/Classes/StoryPageControl.h index b2b2194af..77c26ef56 100644 --- a/media/ios/Classes/StoryPageControl.h +++ b/media/ios/Classes/StoryPageControl.h @@ -21,9 +21,8 @@ NewsBlurAppDelegate *appDelegate; UIProgressView *progressView; - UIToolbar *toolbar; - UIBarButtonItem *buttonPrevious; - UIBarButtonItem *buttonNext; + UIButton *buttonPrevious; + UIButton *buttonNext; UIBarButtonItem *activity; UIActivityIndicatorView *loadingIndicator; UIToolbar *bottomPlaceholderToolbar; @@ -48,9 +47,8 @@ @property (nonatomic, strong) UIActivityIndicatorView *loadingIndicator; @property (nonatomic) IBOutlet UIProgressView *progressView; @property (strong, nonatomic) IBOutlet UIView *progressViewContainer; -@property (nonatomic) IBOutlet UIToolbar *toolbar; -@property (nonatomic) IBOutlet UIBarButtonItem *buttonPrevious; -@property (nonatomic) IBOutlet UIBarButtonItem *buttonNext; +@property (nonatomic) IBOutlet UIButton *buttonPrevious; +@property (nonatomic) IBOutlet UIButton *buttonNext; @property (nonatomic) UIBarButtonItem *buttonBack; @property (nonatomic) IBOutlet UIBarButtonItem *activity; @property (nonatomic) IBOutlet UIBarButtonItem *buttonAction; diff --git a/media/ios/Classes/StoryPageControl.m b/media/ios/Classes/StoryPageControl.m index 896bf3994..351ebfda3 100644 --- a/media/ios/Classes/StoryPageControl.m +++ b/media/ios/Classes/StoryPageControl.m @@ -34,7 +34,7 @@ @synthesize progressViewContainer; @synthesize separatorBarButton; @synthesize spacerBarButton, spacer2BarButton, spacer3BarButton; -@synthesize toolbar, rightToolbar; +@synthesize rightToolbar; @synthesize buttonPrevious; @synthesize buttonNext; @synthesize buttonAction; @@ -92,11 +92,9 @@ [self.progressViewContainer addGestureRecognizer:tap]; self.progressViewContainer.hidden = YES; - - toolbar.autoresizingMask = toolbar.autoresizingMask | UIViewAutoresizingFlexibleHeight; + rightToolbar = [[TransparentToolbar alloc] - initWithFrame:CGRectMake(0, 0, 80, - self.toolbar.frame.size.height)]; + initWithFrame:CGRectMake(0, 0, 80, 44)]; spacerBarButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; @@ -629,29 +627,25 @@ if (readStoryCount == 0 || (readStoryCount == 1 && [appDelegate.readStories lastObject] == [appDelegate.activeStory objectForKey:@"id"])) { - [buttonPrevious setStyle:UIBarButtonItemStyleBordered]; - [buttonPrevious setTitle:@"Previous"]; [buttonPrevious setEnabled:NO]; + [buttonPrevious setAlpha:.4]; } else { - [buttonPrevious setStyle:UIBarButtonItemStyleBordered]; - [buttonPrevious setTitle:@"Previous"]; [buttonPrevious setEnabled:YES]; + [buttonPrevious setAlpha:1]; } // setting up the NEXT UNREAD STORY BUTTON + buttonNext.enabled = YES; int nextIndex = [appDelegate indexOfNextUnreadStory]; int unreadCount = [appDelegate unreadCount]; - if (nextIndex == -1 && unreadCount > 0) { - [buttonNext setStyle:UIBarButtonItemStyleBordered]; - [buttonNext setTitle:@"Next Unread"]; - } else if (nextIndex == -1) { - [buttonNext setStyle:UIBarButtonItemStyleDone]; - [buttonNext setTitle:@"Done"]; + if ((nextIndex == -1 && unreadCount > 0) || + nextIndex != -1) { + [buttonNext setTitle:@"NEXT" forState:UIControlStateNormal]; + [buttonNext setBackgroundImage:[UIImage imageNamed:@"traverse_next.png"] forState:UIControlStateNormal]; } else { - [buttonNext setStyle:UIBarButtonItemStyleBordered]; - [buttonNext setTitle:@"Next Unread"]; + [buttonNext setTitle:@"DONE" forState:UIControlStateNormal]; + [buttonNext setBackgroundImage:[UIImage imageNamed:@"traverse_done.png"] forState:UIControlStateNormal]; } - buttonNext.enabled = YES; float unreads = (float)[appDelegate unreadCount]; float total = [appDelegate originalStoryCount]; diff --git a/media/ios/Classes/StoryPageControl.xib b/media/ios/Classes/StoryPageControl.xib index 3f31e8ded..608bdea30 100644 --- a/media/ios/Classes/StoryPageControl.xib +++ b/media/ios/Classes/StoryPageControl.xib @@ -12,10 +12,10 @@
IBProxyObject - IBUIBarButtonItem + IBUIButton + IBUIImageView IBUIProgressView IBUIScrollView - IBUIToolbar IBUIView @@ -38,96 +38,14 @@ 1316 - - - 1290 - - - - 1314 - {{132, 17}, {56, 11}} - - - - NO - IBCocoaTouchFramework - 0.5 - 1 - - - {{0, 416}, {320, 44}} - - - - - 3 - MQA - - NO - IBCocoaTouchFramework - - - Previous - IBCocoaTouchFramework - 62 - 1 - - - - IBCocoaTouchFramework - - 5 - - - IBCocoaTouchFramework - 56 - - - - - IBCocoaTouchFramework - - 5 - - - NO - IBCocoaTouchFramework - 20 - - - - Next unread - IBCocoaTouchFramework - 82 - 1 - - - - - 2 - MC45MDk4MDM5ODY1IDAuOTE3NjQ3MTIzMyAwLjg5NDExNzcxMwA - - - - - 1293 - {{125, 417}, {70, 43}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 1298 - {320, 416} + {320, 460} - - + 3 MCAwAA @@ -138,11 +56,134 @@ YES NO + + + 1289 + {{193, 415}, {115, 40}} + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + traverse_background.png + + + + + 1289 + {{197, 419}, {40, 32}} + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + 0.0 + 0.0 + 0.0 + 20 + + 3 + MQA + + + 3 + MQA + + 2 + + + + NSImage + traverse_previous.png + + + 2 + 13 + + + Helvetica-Bold + 13 + 16 + + + + + 1289 + {{238, 419}, {66, 32}} + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + 0.0 + 0.0 + 0.0 + 20 + NEXT + + 3 + MC42NjY2NjY2NjY3AA + + + 3 + MQA + + + + 3 + MC41AA + + + NSImage + traverse_next.png + + + Helvetica-Bold + Helvetica + 2 + 13 + + + + + + -2147482359 + {{221, 401}, {64, 11}} + + + NO + 0.80000001192092896 + IBCocoaTouchFramework + 0.5 + 1 + + 3 + MC4zMzMzMzMzMzMzAA + + + 2 + MC45MDk4MDM5ODY1IDAuOTE3NjQ3MTIzMyAwLjg5NDExNzcxMwA + + + + + 1289 + {{205, 391}, {97, 22}} + + + _NS:9 + NO + IBCocoaTouchFramework + {320, 460} - 10 @@ -4556,38 +4597,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 22 - - - activity - - - - 48 - - - - buttonPrevious - - - - 52 - - - - buttonNext - - - - 53 - - - - progressView - - - - 55 - progressViewContainer @@ -4598,11 +4607,27 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - toolbar + buttonPrevious - + - 57 + 67 + + + + progressView + + + + 70 + + + + buttonNext + + + + 72 @@ -4612,29 +4637,23 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 27 - - - tapProgressBar: - - - - 61 - doNextUnreadStory - + + 7 - 59 + 63 doPreviousStory - + + 7 - 60 + 66 @@ -4660,9 +4679,12 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 3 - + + + + - + @@ -4673,59 +4695,28 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - 39 - - - - - - - - - + 38 + - 46 - - + 62 + + - 45 - - + 64 + + - 44 - - - - - + 69 + + - 43 - - - - - 42 - - - - - 40 - - - - - 47 - - - - - 38 - + 71 + @@ -4739,1523 +4730,32 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 61 - - - - - ActivityModule - UIView - - IBProjectSource - ./Classes/ActivityModule.h - - - - AddSiteViewController - UIViewController - - id - id - id - id - id - id - - - - addFolder - id - - - addSite - id - - - checkSiteAddress - id - - - doAddButton - id - - - doCancelButton - id - - - selectAddTypeSignup - id - - - - UIActivityIndicatorView - UIBarButtonItem - UITextField - UISegmentedControl - UILabel - NewsBlurAppDelegate - UIBarButtonItem - UILabel - UIPickerView - UITextField - UINavigationBar - UIActivityIndicatorView - UITextField - UIScrollView - UITableView - - - - activityIndicator - UIActivityIndicatorView - - - addButton - UIBarButtonItem - - - addFolderInput - UITextField - - - addTypeControl - UISegmentedControl - - - addingLabel - UILabel - - - appDelegate - NewsBlurAppDelegate - - - cancelButton - UIBarButtonItem - - - errorLabel - UILabel - - - folderPicker - UIPickerView - - - inFolderInput - UITextField - - - navBar - UINavigationBar - - - siteActivityIndicator - UIActivityIndicatorView - - - siteAddressInput - UITextField - - - siteScrollView - UIScrollView - - - siteTable - UITableView - - - - IBProjectSource - ./Classes/AddSiteViewController.h - - - - BaseViewController - UIViewController - - IBProjectSource - ./Classes/BaseViewController.h - - - - DashboardViewController - UIViewController - - id - id - - - - doLogout: - id - - - tapSegmentedButton: - id - - - - ActivityModule - NewsBlurAppDelegate - UIWebView - InteractionsModule - UISegmentedControl - UIToolbar - UIToolbar - - - - activitiesModule - ActivityModule - - - appDelegate - NewsBlurAppDelegate - - - feedbackWebView - UIWebView - - - interactionsModule - InteractionsModule - - - segmentedButton - UISegmentedControl - - - toolbar - UIToolbar - - - topToolbar - UIToolbar - - - - IBProjectSource - ./Classes/DashboardViewController.h - - - - FeedDetailMenuViewController - UIViewController - - id - id - - - - changeOrder: - id - - - changeReadFilter: - id - - - - NewsBlurAppDelegate - UITableView - UISegmentedControl - UISegmentedControl - - - - appDelegate - NewsBlurAppDelegate - - - menuTableView - UITableView - - - orderSegmentedControl - UISegmentedControl - - - readFilterSegmentedControl - UISegmentedControl - - - - IBProjectSource - ./Classes/FeedDetailMenuViewController.h - - - - FeedDetailViewController - BaseViewController - - id - id - id - - - - doOpenMarkReadActionSheet: - id - - - doOpenSettingsActionSheet: - id - - - selectIntelligence - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UISlider - UIToolbar - UISegmentedControl - UIBarButtonItem - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - feedMarkReadButton - UIBarButtonItem - - - feedScoreSlider - UISlider - - - feedViewToolbar - UIToolbar - - - intelligenceControl - UISegmentedControl - - - settingsButton - UIBarButtonItem - - - storyTitlesTable - UITableView - - - - IBProjectSource - ./Classes/FeedDetailViewController.h - - - - FeedsMenuViewController - UIViewController - - NewsBlurAppDelegate - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - menuTableView - UITableView - - - - IBProjectSource - ./Classes/FeedsMenuViewController.h - - - - FindSitesViewController - UIViewController - - NewsBlurAppDelegate - UISearchBar - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - sitesSearchBar - UISearchBar - - - sitesTable - UITableView - - - - IBProjectSource - ./Classes/FindSitesViewController.h - - - - FirstTimeUserAddFriendsViewController - UIViewController - - id - id - id - id - - - - tapFacebookButton - id - - - tapNextButton - id - - - tapTwitterButton - id - - - toggleAutoFollowFriends: - id - - - - NewsBlurAppDelegate - UIActivityIndicatorView - UIButton - UILabel - UIBarButtonItem - UIActivityIndicatorView - UIButton - - - - appDelegate - NewsBlurAppDelegate - - - facebookActivityIndicator - UIActivityIndicatorView - - - facebookButton - UIButton - - - friendsLabel - UILabel - - - nextButton - UIBarButtonItem - - - twitterActivityIndicator - UIActivityIndicatorView - - - twitterButton - UIButton - - - - IBProjectSource - ./Classes/FirstTimeUserAddFriendsViewController.h - - - - FirstTimeUserAddNewsBlurViewController - UIViewController - - id - id - id - - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - tapPopularButton: - id - - - - NewsBlurAppDelegate - UILabel - UIBarButtonItem - - - - appDelegate - NewsBlurAppDelegate - - - instructionsLabel - UILabel - - - nextButton - UIBarButtonItem - - - - IBProjectSource - ./Classes/FirstTimeUserAddNewsBlurViewController.h - - - - FirstTimeUserAddSitesViewController - UIViewController - - tapNextButton - id - - - tapNextButton - - tapNextButton - id - - - - UIActivityIndicatorView - NewsBlurAppDelegate - UITableView - UIButton - UIView - UILabel - UIBarButtonItem - UIScrollView - - - - activityIndicator - UIActivityIndicatorView - - - appDelegate - NewsBlurAppDelegate - - - categoriesTable - UITableView - - - googleReaderButton - UIButton - - - googleReaderButtonWrapper - UIView - - - instructionLabel - UILabel - - - nextButton - UIBarButtonItem - - - scrollView - UIScrollView - - - - IBProjectSource - ./Classes/FirstTimeUserAddSitesViewController.h - - - - FirstTimeUserViewController - UIViewController - - tapNextButton - id - - - tapNextButton - - tapNextButton - id - - - - NewsBlurAppDelegate - UILabel - UILabel - UIImageView - UIBarButtonItem - - - - appDelegate - NewsBlurAppDelegate - - - footer - UILabel - - - header - UILabel - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - - IBProjectSource - ./Classes/FirstTimeUserViewController.h - - - - FontSettingsViewController - UIViewController - - id - id - - - - changeFontSize: - id - - - changeFontStyle: - id - - - - NewsBlurAppDelegate - UISegmentedControl - UISegmentedControl - UILabel - UITableView - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - fontSizeSegment - UISegmentedControl - - - fontStyleSegment - UISegmentedControl - - - largeFontSizeLabel - UILabel - - - menuTableView - UITableView - - - smallFontSizeLabel - UILabel - - - - IBProjectSource - ./Classes/FontSettingsViewController.h - - - - FriendsListViewController - UIViewController - - NewsBlurAppDelegate - UISearchBar - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - friendSearchBar - UISearchBar - - - friendsTable - UITableView - - - - IBProjectSource - ./Classes/FriendsListViewController.h - - - - InteractionsModule - UIView - - IBProjectSource - ./Classes/InteractionsModule.h - - - - LoginViewController - UIViewController - - id - id - id - id - id - - - - selectLogin - id - - - selectLoginSignup - id - - - selectSignUp - id - - - tapLoginButton - id - - - tapSignUpButton - id - - - - NewsBlurAppDelegate - UITextField - UILabel - UILabel - UIView - UISegmentedControl - UITextField - UILabel - UILabel - UIButton - UIButton - UITextField - UITextField - UIView - UITextField - UILabel - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - emailInput - UITextField - - - emailLabel - UILabel - - - errorLabel - UILabel - - - logInView - UIView - - - loginControl - UISegmentedControl - - - passwordInput - UITextField - - - passwordLabel - UILabel - - - passwordOptionalLabel - UILabel - - - selectLoginButton - UIButton - - - selectSignUpButton - UIButton - - - signUpPasswordInput - UITextField - - - signUpUsernameInput - UITextField - - - signUpView - UIView - - - usernameInput - UITextField - - - usernameLabel - UILabel - - - usernameOrEmailLabel - UILabel - - - - IBProjectSource - ./Classes/LoginViewController.h - - - - MoveSiteViewController - UIViewController - - id - id - id - id - - - - doCancelButton - id - - - doMoveButton - id - - - moveFolder - id - - - moveSite - id - - - - UIActivityIndicatorView - NewsBlurAppDelegate - UIBarButtonItem - UILabel - UIPickerView - UITextField - UIBarButtonItem - UILabel - UINavigationBar - UILabel - UITextField - - - - activityIndicator - UIActivityIndicatorView - - - appDelegate - NewsBlurAppDelegate - - - cancelButton - UIBarButtonItem - - - errorLabel - UILabel - - - folderPicker - UIPickerView - - - fromFolderInput - UITextField - - - moveButton - UIBarButtonItem - - - movingLabel - UILabel - - - navBar - UINavigationBar - - - titleLabel - UILabel - - - toFolderInput - UITextField - - - - IBProjectSource - ./Classes/MoveSiteViewController.h - - - - NBContainerViewController - UIViewController - - appDelegate - NewsBlurAppDelegate - - - appDelegate - - appDelegate - NewsBlurAppDelegate - - - - IBProjectSource - ./Classes/NBContainerViewController.h - - - - NewsBlurAppDelegate - BaseViewController - - AddSiteViewController - DashboardViewController - FeedDashboardViewController - FeedDetailMenuViewController - FeedDetailViewController - FeedsMenuViewController - NewsBlurViewController - FindSitesViewController - FirstTimeUserAddFriendsViewController - FirstTimeUserAddNewsBlurViewController - FirstTimeUserAddSitesViewController - FirstTimeUserViewController - FontSettingsViewController - FriendsListViewController - UINavigationController - LoginViewController - NBContainerViewController - MoveSiteViewController - UINavigationController - OriginalStoryViewController - ShareViewController - StoryDetailViewController - StoryPageControl - TrainerViewController - UserProfileViewController - UIWindow - - - - addSiteViewController - AddSiteViewController - - - dashboardViewController - DashboardViewController - - - feedDashboardViewController - FeedDashboardViewController - - - feedDetailMenuViewController - FeedDetailMenuViewController - - - feedDetailViewController - FeedDetailViewController - - - feedsMenuViewController - FeedsMenuViewController - - - feedsViewController - NewsBlurViewController - - - findSitesViewController - FindSitesViewController - - - firstTimeUserAddFriendsViewController - FirstTimeUserAddFriendsViewController - - - firstTimeUserAddNewsBlurViewController - FirstTimeUserAddNewsBlurViewController - - - firstTimeUserAddSitesViewController - FirstTimeUserAddSitesViewController - - - firstTimeUserViewController - FirstTimeUserViewController - - - fontSettingsViewController - FontSettingsViewController - - - friendsListViewController - FriendsListViewController - - - ftuxNavigationController - UINavigationController - - - loginViewController - LoginViewController - - - masterContainerViewController - NBContainerViewController - - - moveSiteViewController - MoveSiteViewController - - - navigationController - UINavigationController - - - originalStoryViewController - OriginalStoryViewController - - - shareViewController - ShareViewController - - - storyDetailViewController - StoryDetailViewController - - - storyPageControl - StoryPageControl - - - trainerViewController - TrainerViewController - - - userProfileViewController - UserProfileViewController - - - window - UIWindow - - - - IBProjectSource - ./Classes/NewsBlurAppDelegate.h - - - - NewsBlurViewController - BaseViewController - - UIButton - UIButton - UIButton - id - id - - - - sectionTapped: - UIButton - - - sectionUntapped: - UIButton - - - sectionUntappedOutside: - UIButton - - - selectIntelligence - id - - - tapAddSite: - id - - - - NewsBlurAppDelegate - UISlider - UITableView - UIToolbar - UIBarButtonItem - UIView - UISegmentedControl - UIView - UIBarButtonItem - - - - appDelegate - NewsBlurAppDelegate - - - feedScoreSlider - UISlider - - - feedTitlesTable - UITableView - - - feedViewToolbar - UIToolbar - - - homeButton - UIBarButtonItem - - - innerView - UIView - - - intelligenceControl - UISegmentedControl - - - noFocusMessage - UIView - - - toolbarLeftMargin - UIBarButtonItem - - - - IBProjectSource - ./Classes/NewsBlurViewController.h - - - - OriginalStoryViewController - BaseViewController - - id - id - id - - - - doCloseOriginalStoryViewController - id - - - doOpenActionSheet - id - - - loadAddress: - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UILabel - UITextField - UIBarButtonItem - UIToolbar - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - back - UIBarButtonItem - - - closeButton - UIBarButtonItem - - - forward - UIBarButtonItem - - - pageAction - UIBarButtonItem - - - pageTitle - UILabel - - - pageUrl - UITextField - - - refresh - UIBarButtonItem - - - toolbar - UIToolbar - - - webView - UIWebView - - - - IBProjectSource - ./Classes/OriginalStoryViewController.h - - - - ShareViewController - UIViewController - - id - id - id - id - - - - doCancelButton: - id - - - doReplyToComment: - id - - - doShareThisStory: - id - - - doToggleButton: - id - - - - NewsBlurAppDelegate - UITextView - UIButton - UIBarButtonItem - UIButton - - - - appDelegate - NewsBlurAppDelegate - - - commentField - UITextView - - - facebookButton - UIButton - - - submitButton - UIBarButtonItem - - - twitterButton - UIButton - - - - IBProjectSource - ./Classes/ShareViewController.h - - - - StoryDetailViewController - BaseViewController - - NewsBlurAppDelegate - UIView - UIView - UILabel - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - feedTitleGradient - UIView - - - innerView - UIView - - - noStorySelectedLabel - UILabel - - - webView - UIWebView - - - - IBProjectSource - ./Classes/StoryDetailViewController.h - - - - StoryPageControl - BaseViewController - - id - id - id - id - id - - - - doNextUnreadStory - id - - - doPreviousStory - id - - - showOriginalSubview: - id - - - tapProgressBar: - id - - - toggleFontSize: - id - - - - UIBarButtonItem - NewsBlurAppDelegate - UIToolbar - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIPageControl - UIProgressView - UIView - UIScrollView - UIBarButtonItem - UIToolbar - - - - activity - UIBarButtonItem - - - appDelegate - NewsBlurAppDelegate - - - bottomPlaceholderToolbar - UIToolbar - - - buttonAction - UIBarButtonItem - - - buttonNext - UIBarButtonItem - - - buttonPrevious - UIBarButtonItem - - - fontSettingsButton - UIBarButtonItem - - - originalStoryButton - UIBarButtonItem - - - pageControl - UIPageControl - - - progressView - UIProgressView - - - progressViewContainer - UIView - - - scrollView - UIScrollView - - - subscribeButton - UIBarButtonItem - - - toolbar - UIToolbar - - - - IBProjectSource - ./Classes/StoryPageControl.h - - - - TrainerViewController - BaseViewController - - doCloseDialog: - id - - - doCloseDialog: - - doCloseDialog: - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UINavigationBar - TrainerWebView - - - - appDelegate - NewsBlurAppDelegate - - - closeButton - UIBarButtonItem - - - navBar - UINavigationBar - - - webView - TrainerWebView - - - - IBProjectSource - ./Classes/TrainerViewController.h - - - - TrainerWebView - UIWebView - - IBProjectSource - ./Classes/TrainerWebView.h - - - - UserProfileViewController - UIViewController - - IBProjectSource - ./Classes/UserProfileViewController.h - - - + 72 + 0 IBCocoaTouchFramework YES 3 + + {108, 44} + {68, 32} + {40, 32} + 2083 diff --git a/media/ios/NewsBlur.xcodeproj/project.pbxproj b/media/ios/NewsBlur.xcodeproj/project.pbxproj index d3402c350..019a7abec 100755 --- a/media/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/media/ios/NewsBlur.xcodeproj/project.pbxproj @@ -328,6 +328,14 @@ FF67D3CD168A73380057A7DA /* zepto.js in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3BF168A708D0057A7DA /* zepto.js */; }; FF67D3CE168A73380057A7DA /* trainer.js in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3C4168A71870057A7DA /* trainer.js */; }; FF67D3CF168A73380057A7DA /* fastTouch.js in Resources */ = {isa = PBXBuildFile; fileRef = FF67D3C6168A71B30057A7DA /* fastTouch.js */; }; + FF688E4616E6ADB1003B7B42 /* traverse_next.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E4416E6ADB1003B7B42 /* traverse_next.png */; }; + FF688E4716E6ADB1003B7B42 /* traverse_next@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E4516E6ADB1003B7B42 /* traverse_next@2x.png */; }; + FF688E4A16E6AFD3003B7B42 /* traverse_previous.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E4816E6AFD3003B7B42 /* traverse_previous.png */; }; + FF688E4B16E6AFD3003B7B42 /* traverse_previous@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E4916E6AFD3003B7B42 /* traverse_previous@2x.png */; }; + FF688E4E16E6B3E1003B7B42 /* traverse_done.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E4C16E6B3E1003B7B42 /* traverse_done.png */; }; + FF688E4F16E6B3E1003B7B42 /* traverse_done@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E4D16E6B3E1003B7B42 /* traverse_done@2x.png */; }; + FF688E5216E6B8D0003B7B42 /* traverse_background.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E5016E6B8D0003B7B42 /* traverse_background.png */; }; + FF688E5316E6B8D0003B7B42 /* traverse_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF688E5116E6B8D0003B7B42 /* traverse_background@2x.png */; }; FF6A233216448E0700E15989 /* StoryPageControl.m in Sources */ = {isa = PBXBuildFile; fileRef = FF6A233116448E0700E15989 /* StoryPageControl.m */; }; FF6A23391644957800E15989 /* StoryPageControl.xib in Resources */ = {isa = PBXBuildFile; fileRef = FF6A23361644903900E15989 /* StoryPageControl.xib */; }; FF793E1B13F1A9F700F282D2 /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = FF793E1813F1A9F700F282D2 /* ASIDataCompressor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; @@ -860,6 +868,14 @@ FF67D3BF168A708D0057A7DA /* zepto.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = zepto.js; path = ../static/zepto.js; sourceTree = ""; }; FF67D3C4168A71870057A7DA /* trainer.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = trainer.js; path = ../static/trainer.js; sourceTree = ""; }; FF67D3C6168A71B30057A7DA /* fastTouch.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = fastTouch.js; path = ../static/fastTouch.js; sourceTree = ""; }; + FF688E4416E6ADB1003B7B42 /* traverse_next.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_next.png; sourceTree = ""; }; + FF688E4516E6ADB1003B7B42 /* traverse_next@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_next@2x.png"; sourceTree = ""; }; + FF688E4816E6AFD3003B7B42 /* traverse_previous.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_previous.png; sourceTree = ""; }; + FF688E4916E6AFD3003B7B42 /* traverse_previous@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_previous@2x.png"; sourceTree = ""; }; + FF688E4C16E6B3E1003B7B42 /* traverse_done.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_done.png; sourceTree = ""; }; + FF688E4D16E6B3E1003B7B42 /* traverse_done@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_done@2x.png"; sourceTree = ""; }; + FF688E5016E6B8D0003B7B42 /* traverse_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = traverse_background.png; sourceTree = ""; }; + FF688E5116E6B8D0003B7B42 /* traverse_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "traverse_background@2x.png"; sourceTree = ""; }; FF6A233016448E0700E15989 /* StoryPageControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StoryPageControl.h; sourceTree = ""; }; FF6A233116448E0700E15989 /* StoryPageControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StoryPageControl.m; sourceTree = ""; }; FF6A23361644903900E15989 /* StoryPageControl.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = StoryPageControl.xib; path = ../Classes/StoryPageControl.xib; sourceTree = ""; }; @@ -1169,6 +1185,14 @@ 431B857615A132B600DCE497 /* Images */ = { isa = PBXGroup; children = ( + FF688E5016E6B8D0003B7B42 /* traverse_background.png */, + FF688E5116E6B8D0003B7B42 /* traverse_background@2x.png */, + FF688E4C16E6B3E1003B7B42 /* traverse_done.png */, + FF688E4D16E6B3E1003B7B42 /* traverse_done@2x.png */, + FF688E4816E6AFD3003B7B42 /* traverse_previous.png */, + FF688E4916E6AFD3003B7B42 /* traverse_previous@2x.png */, + FF688E4416E6ADB1003B7B42 /* traverse_next.png */, + FF688E4516E6ADB1003B7B42 /* traverse_next@2x.png */, FF22FE7416E557D80046165A /* toolbar_tall_background.png */, FF22FE7516E557D80046165A /* toolbar_tall_background@2x.png */, FF22FE7016E554FD0046165A /* barbutton_sendto.png */, @@ -2197,6 +2221,14 @@ FF22FE7316E554FD0046165A /* barbutton_sendto@2x.png in Resources */, FF22FE7616E557D80046165A /* toolbar_tall_background.png in Resources */, FF22FE7716E557D80046165A /* toolbar_tall_background@2x.png in Resources */, + FF688E4616E6ADB1003B7B42 /* traverse_next.png in Resources */, + FF688E4716E6ADB1003B7B42 /* traverse_next@2x.png in Resources */, + FF688E4A16E6AFD3003B7B42 /* traverse_previous.png in Resources */, + FF688E4B16E6AFD3003B7B42 /* traverse_previous@2x.png in Resources */, + FF688E4E16E6B3E1003B7B42 /* traverse_done.png in Resources */, + FF688E4F16E6B3E1003B7B42 /* traverse_done@2x.png in Resources */, + FF688E5216E6B8D0003B7B42 /* traverse_background.png in Resources */, + FF688E5316E6B8D0003B7B42 /* traverse_background@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/media/ios/Resources-iPad/Classes/StoryPageControl~ipad.xib b/media/ios/Resources-iPad/Classes/StoryPageControl~ipad.xib index d5801abc7..36b44d8fc 100644 --- a/media/ios/Resources-iPad/Classes/StoryPageControl~ipad.xib +++ b/media/ios/Resources-iPad/Classes/StoryPageControl~ipad.xib @@ -1,21 +1,21 @@ - 1536 + 1552 12C3006 - 2840 + 3084 1187.34 625.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 2083 IBProxyObject - IBUIBarButtonItem + IBUIButton + IBUIImageView IBUIProgressView IBUIScrollView - IBUIToolbar IBUIView @@ -43,10 +43,10 @@ 1298 - {768, 936} + {808, 1013} - + 3 MCAwAA @@ -58,102 +58,138 @@ YES NO - + - 266 - - - - 290 - {{356, 17}, {56, 11}} - - - - NO - IBIPadFramework - 0.5 - 1 - - - {{0, 936}, {768, 44}} + 265 + {{673, 965}, {115, 40}} - - + + _NS:9 + NO + IBIPadFramework + + NSImage + traverse_background.png + + + + + 265 + {{718, 969}, {66, 32}} + + + _NS:9 + NO + IBIPadFramework + 0 + 0 + 0.0 + 0.0 + 0.0 + 20 + NEXT + + 3 + MC42NjY2NjY2NjY3AA + + + 3 + MQA + + 2 + + + + 3 + MC41AA + + + NSImage + traverse_next.png + + + Helvetica-Bold + Helvetica + 2 + 13 + + + Helvetica-Bold + 13 + 16 + + + + + 265 + {{677, 969}, {40, 32}} + + + + _NS:9 + NO + IBIPadFramework + 0 + 0 + 0.0 + 0.0 + 0.0 + 20 + + 3 MQA - NO + + 3 + MQA + + + + NSImage + traverse_previous.png + + + 2 + 13 + + + + + + 265 + {{683, 943}, {97, 22}} + + + + _NS:9 + NO IBIPadFramework - - - Previous - IBIPadFramework - 62 - 1 - - - - IBIPadFramework - - 5 - - - IBIPadFramework - 56 - - - - - IBIPadFramework - - 5 - - - NO - IBIPadFramework - 20 - - - - Next unread - IBIPadFramework - 82 - 1 - - - - - 1 - MC4yMjcwMjkxMjggMC4zNjIxMzU3NzY0IDAuNDU2NTIxNzM5MQA + + + + -2147483383 + {{699, 952}, {64, 11}} + + + + NO + 0.80000001192092896 + IBIPadFramework + 0.5 + 1 + + 3 + MC4zMzMzMzMzMzMzAA + + + 2 + MC45MDk4MDM5ODY1IDAuOTE3NjQ3MTIzMyAwLjg5NDExNzcxMwA - - - 266 - {{0, 935}, {768, 44}} - - - - _NS:9 - NO - NO - IBIPadFramework - - - - - 269 - {{350, 936}, {70, 43}} - - - _NS:9 - NO - NO - IBIPadFramework - - {768, 980} + {808, 1013} @@ -4561,54 +4597,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 73 - - - activity - - - - 67 - - - - buttonNext - - - - 68 - - - - progressView - - - - 71 - - - - buttonPrevious - - - - 70 - - - - progressViewContainer - - - - 72 - - - - toolbar - - - - 116 - view @@ -4619,11 +4607,35 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - bottomPlaceholderToolbar + progressView - + - 138 + 151 + + + + progressViewContainer + + + + 152 + + + + buttonNext + + + + 153 + + + + buttonPrevious + + + + 154 @@ -4633,29 +4645,23 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 118 - - - tapProgressBar: - - - - 124 - doNextUnreadStory - + + 7 - 120 + 149 doPreviousStory - + + 7 - 121 + 150 @@ -4670,9 +4676,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE 1 - - - + + + + + @@ -4688,73 +4696,36 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE - - 5 - - - - - - - - - - - - - 7 - - - - - 9 - - - - - 10 - - - - - 11 - - - - - - - - 12 - - - - - 13 - - - - - 14 - - - - - 4 - - - - - - 125 - - - 6 + + 144 + + + + + 145 + + + + + 146 + + + + + 147 + + + + + 148 + + + @@ -4763,25 +4734,22 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 138 + 154 @@ -4797,18 +4765,13 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE AddSiteViewController UIViewController - id id id id id - id + id - - addFolder - id - addSite id @@ -4825,16 +4788,16 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE doCancelButton id - - selectAddTypeSignup + + toggleAddFolder: id UIActivityIndicatorView UIBarButtonItem + UIButton UITextField - UISegmentedControl UILabel NewsBlurAppDelegate UIBarButtonItem @@ -4856,14 +4819,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE addButton UIBarButtonItem + + addFolderButton + UIButton + addFolderInput UITextField - - addTypeControl - UISegmentedControl - addingLabel UILabel @@ -5035,7 +4998,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE id id - id @@ -5046,18 +5008,16 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE doOpenSettingsActionSheet: id - - selectIntelligence - id - NewsBlurAppDelegate UIBarButtonItem - UISlider - UIToolbar - UISegmentedControl - UIBarButtonItem + TransparentToolbar + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem UITableView @@ -5069,20 +5029,28 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE feedMarkReadButton UIBarButtonItem - - feedScoreSlider - UISlider + + rightToolbar + TransparentToolbar - - feedViewToolbar - UIToolbar + + separatorBarButton + UIBarButtonItem - - intelligenceControl - UISegmentedControl + + settingsBarButton + UIBarButtonItem - - settingsButton + + spacer2BarButton + UIBarButtonItem + + + spacer3BarButton + UIBarButtonItem + + + spacerBarButton UIBarButtonItem @@ -5117,33 +5085,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE ./Classes/FeedsMenuViewController.h - - FindSitesViewController - UIViewController - - NewsBlurAppDelegate - UISearchBar - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - sitesSearchBar - UISearchBar - - - sitesTable - UITableView - - - - IBProjectSource - ./Classes/FindSitesViewController.h - - FirstTimeUserAddFriendsViewController UIViewController @@ -5699,6 +5640,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE ./Classes/NBContainerViewController.h + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + NewsBlurAppDelegate BaseViewController @@ -5710,7 +5659,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE FeedDetailViewController FeedsMenuViewController NewsBlurViewController - FindSitesViewController FirstTimeUserAddFriendsViewController FirstTimeUserAddNewsBlurViewController FirstTimeUserAddSitesViewController @@ -5726,6 +5674,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE ShareViewController StoryDetailViewController StoryPageControl + TrainerViewController UserProfileViewController UIWindow @@ -5758,10 +5707,6 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE feedsViewController NewsBlurViewController - - findSitesViewController - FindSitesViewController - firstTimeUserAddFriendsViewController FirstTimeUserAddFriendsViewController @@ -5822,6 +5767,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE storyPageControl StoryPageControl + + trainerViewController + TrainerViewController + userProfileViewController UserProfileViewController @@ -5844,6 +5793,8 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UIButton UIButton id + id + id id @@ -5863,12 +5814,22 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE selectIntelligence id + + showInteractionsPopover: + id + + + showSettingsPopover: + id + tapAddSite: id + UIBarButtonItem + UIBarButtonItem NewsBlurAppDelegate UISlider UITableView @@ -5877,9 +5838,18 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE UIView UISegmentedControl UIView + UIBarButtonItem UIBarButtonItem + + activitiesButton + UIBarButtonItem + + + addBarButton + UIBarButtonItem + appDelegate NewsBlurAppDelegate @@ -5912,6 +5882,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE noFocusMessage UIView + + settingsBarButton + UIBarButtonItem + toolbarLeftMargin UIBarButtonItem @@ -5929,6 +5903,9 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE id id id + id + id + id @@ -5943,6 +5920,18 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE loadAddress: id + + webViewGoBack: + id + + + webViewGoForward: + id + + + webViewRefresh: + id + NewsBlurAppDelegate @@ -6032,8 +6021,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE NewsBlurAppDelegate + UIButton UITextView UIButton + NSLayoutConstraint + UILabel UIBarButtonItem UIButton @@ -6042,6 +6034,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE appDelegate NewsBlurAppDelegate + + appdotnetButton + UIButton + commentField UITextView @@ -6050,6 +6046,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE facebookButton UIButton + + keyboardHeight + NSLayoutConstraint + + + storyTitle + UILabel + submitButton UIBarButtonItem @@ -6138,16 +6142,20 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE NewsBlurAppDelegate UIToolbar UIBarButtonItem - UIBarButtonItem - UIBarButtonItem + UIButton + UIButton UIBarButtonItem UIBarButtonItem UIPageControl UIProgressView UIView + TransparentToolbar UIScrollView + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem UIBarButtonItem - UIToolbar @@ -6168,11 +6176,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE buttonNext - UIBarButtonItem + UIButton buttonPrevious - UIBarButtonItem + UIButton fontSettingsButton @@ -6194,24 +6202,99 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE progressViewContainer UIView + + rightToolbar + TransparentToolbar + scrollView UIScrollView + + separatorBarButton + UIBarButtonItem + + + spacer2BarButton + UIBarButtonItem + + + spacer3BarButton + UIBarButtonItem + + + spacerBarButton + UIBarButtonItem + subscribeButton UIBarButtonItem - - toolbar - UIToolbar - IBProjectSource ./Classes/StoryPageControl.h + + TrainerViewController + BaseViewController + + doCloseDialog: + id + + + doCloseDialog: + + doCloseDialog: + id + + + + NewsBlurAppDelegate + UIBarButtonItem + UINavigationBar + TrainerWebView + + + + appDelegate + NewsBlurAppDelegate + + + closeButton + UIBarButtonItem + + + navBar + UINavigationBar + + + webView + TrainerWebView + + + + IBProjectSource + ./Classes/TrainerViewController.h + + + + TrainerWebView + UIWebView + + IBProjectSource + ./Classes/TrainerWebView.h + + + + TransparentToolbar + UIToolbar + + IBProjectSource + ./Classes/TransparentToolbar.h + + UserProfileViewController UIViewController @@ -6226,6 +6309,11 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE IBIPadFramework YES 3 - 1926 + + {108, 44} + {68, 32} + {40, 32} + + 2083 diff --git a/media/ios/Resources/traverse_background.png b/media/ios/Resources/traverse_background.png new file mode 100644 index 000000000..e0ed844db Binary files /dev/null and b/media/ios/Resources/traverse_background.png differ diff --git a/media/ios/Resources/traverse_background@2x.png b/media/ios/Resources/traverse_background@2x.png new file mode 100644 index 000000000..36085e1c7 Binary files /dev/null and b/media/ios/Resources/traverse_background@2x.png differ diff --git a/media/ios/Resources/traverse_done.png b/media/ios/Resources/traverse_done.png new file mode 100644 index 000000000..c861d42df Binary files /dev/null and b/media/ios/Resources/traverse_done.png differ diff --git a/media/ios/Resources/traverse_done@2x.png b/media/ios/Resources/traverse_done@2x.png new file mode 100644 index 000000000..3a860fe91 Binary files /dev/null and b/media/ios/Resources/traverse_done@2x.png differ diff --git a/media/ios/Resources/traverse_next.png b/media/ios/Resources/traverse_next.png new file mode 100644 index 000000000..755996a12 Binary files /dev/null and b/media/ios/Resources/traverse_next.png differ diff --git a/media/ios/Resources/traverse_next@2x.png b/media/ios/Resources/traverse_next@2x.png new file mode 100644 index 000000000..44c2cfb21 Binary files /dev/null and b/media/ios/Resources/traverse_next@2x.png differ diff --git a/media/ios/Resources/traverse_previous.png b/media/ios/Resources/traverse_previous.png new file mode 100644 index 000000000..d23a8e0d6 Binary files /dev/null and b/media/ios/Resources/traverse_previous.png differ diff --git a/media/ios/Resources/traverse_previous@2x.png b/media/ios/Resources/traverse_previous@2x.png new file mode 100644 index 000000000..9c3c07859 Binary files /dev/null and b/media/ios/Resources/traverse_previous@2x.png differ diff --git a/media/ios/static/storyDetailView.css b/media/ios/static/storyDetailView.css index 6b33af308..b854f3dc7 100644 --- a/media/ios/static/storyDetailView.css +++ b/media/ios/static/storyDetailView.css @@ -165,6 +165,7 @@ body { text-rendering: optimizeLegibility; margin: 0; + padding-bottom: 36px; -webkit-text-size-adjust: none; font-size: 14px;