diff --git a/media/ios/Classes/NewsBlurAppDelegate.m b/media/ios/Classes/NewsBlurAppDelegate.m index aca3440b8..eee505657 100644 --- a/media/ios/Classes/NewsBlurAppDelegate.m +++ b/media/ios/Classes/NewsBlurAppDelegate.m @@ -783,18 +783,11 @@ // changes the story layout in story feed detail [self.feedDetailViewController changeActiveStoryTitleCellLayout]; - - // set the current row as read -// NSMutableArray *newActiveFeedStories = [self.activeFeedStories mutableCopy]; -// NSMutableDictionary *newActiveStory = [[newActiveFeedStories objectAtIndex:activeLocation] mutableCopy]; -// [newActiveStory setValue:[NSNumber numberWithInt:1] forKey:@"read_status"]; -// [newActiveFeedStories replaceObjectAtIndex:activeLocation withObject:newActiveStory]; -// self.activeFeedStories = newActiveFeedStories; -// self.activeStory = [self.activeFeedStories objectAtIndex:activeLocation]; -// + int activeIndex = [[activeFeedStoryLocations objectAtIndex:activeLocation] intValue]; NSDictionary *feed; + NSDictionary *friendFeed; id feedId; NSString *feedIdStr; NSMutableArray *otherFriendFeeds = [[self.activeStory objectForKey:@"shared_by_friends"] mutableCopy]; @@ -805,7 +798,7 @@ feed = [self.dictSocialFeeds objectForKey:feedIdStr]; [otherFriendFeeds removeObject:feedId]; -// NSLog(@"otherFriendFeeds is %@", otherFriendFeeds); + NSLog(@"otherFriendFeeds is %@", otherFriendFeeds); } else { feedId = [self.activeStory objectForKey:@"story_feed_id"]; feedIdStr = [NSString stringWithFormat:@"%@",feedId]; @@ -813,24 +806,21 @@ } NSDictionary *story = [activeFeedStories objectAtIndex:activeIndex]; - if (self.activeFeed != feed) { -// NSLog(@"activeFeed; %@, feed: %@", activeFeed, feed); - self.activeFeed = feed; - } - - [self.recentlyReadStories addObject:[NSNumber numberWithInt:activeLocation]]; - [self markStoryRead:story feed:feed]; - - // decrement all other friend feeds + // decrement all other friend feeds if they have the same story if (self.isSocialView) { for (int i = 0; i < otherFriendFeeds.count; i++) { feedIdStr = [NSString stringWithFormat:@"social:%@", [otherFriendFeeds objectAtIndex:i]]; - feed = [self.dictSocialFeeds objectForKey:feedIdStr]; - [self markStoryRead:story feed:feed]; + friendFeed = [self.dictSocialFeeds objectForKey:feedIdStr]; + [self markStoryRead:story feed:friendFeed]; } } + // make sure we set the active feed + self.activeFeed = feed; + + [self.recentlyReadStories addObject:[NSNumber numberWithInt:activeLocation]]; + [self markStoryRead:story feed:feed]; } - (NSDictionary *)markVisibleStoriesRead { diff --git a/media/ios/Classes/ShareViewController.h b/media/ios/Classes/ShareViewController.h index 35db183bf..1e6f50d3b 100644 --- a/media/ios/Classes/ShareViewController.h +++ b/media/ios/Classes/ShareViewController.h @@ -32,6 +32,7 @@ - (void)finishAddReply:(ASIHTTPRequest *)request; - (void)requestFailed:(ASIHTTPRequest *)request; - (void)replaceStory:(NSDictionary *)newStory withReplyId:(NSString *)replyId; +- (void)adjustCommentField; - (NSString *)stringByStrippingHTML:(NSString *)s; @end diff --git a/media/ios/Classes/ShareViewController.m b/media/ios/Classes/ShareViewController.m index b6b162232..17bff334b 100644 --- a/media/ios/Classes/ShareViewController.m +++ b/media/ios/Classes/ShareViewController.m @@ -78,9 +78,28 @@ return YES; } +- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { + [self adjustCommentField]; +} + - (void)viewWillAppear:(BOOL)animated { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { [self.commentField becomeFirstResponder]; + + [self adjustCommentField]; + } +} + +- (void)adjustCommentField { + UIInterfaceOrientation orientation = (UIInterfaceOrientation)[[UIApplication sharedApplication] statusBarOrientation]; + if (UIInterfaceOrientationIsPortrait(orientation)){ + self.commentField.frame = CGRectMake(20, 20, 280, 114); + self.twitterButton.frame = CGRectMake(228, 142, 32, 32); + self.facebookButton.frame = CGRectMake(268, 142, 32, 32); + } else { + self.commentField.frame = CGRectMake(60, 20, 400, 74); + self.twitterButton.frame = CGRectMake(15, 20, 32, 32); + self.facebookButton.frame = CGRectMake(15, 60, 32, 32); } } diff --git a/media/ios/Classes/StoryDetailViewController.h b/media/ios/Classes/StoryDetailViewController.h index 5476a6178..b9b13c228 100644 --- a/media/ios/Classes/StoryDetailViewController.h +++ b/media/ios/Classes/StoryDetailViewController.h @@ -83,7 +83,8 @@ - (IBAction)toggleFontSize:(id)sender; - (void)setFontStyle:(NSString *)fontStyle; - (void)changeFontSize:(NSString *)fontSize; -- (NSString *)getComments:(NSString *)type; +- (NSString *)getShareBar; +- (NSString *)getComments; - (NSString *)getComment:(NSDictionary *)commentDict; - (NSString *)getReplies:(NSArray *)replies forUserId:(NSString *)commentUserId; - (NSString *)getAvatars:(BOOL)areFriends; diff --git a/media/ios/Classes/StoryDetailViewController.m b/media/ios/Classes/StoryDetailViewController.m index 26e70312d..467cb336e 100644 --- a/media/ios/Classes/StoryDetailViewController.m +++ b/media/ios/Classes/StoryDetailViewController.m @@ -155,7 +155,7 @@ - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - + [appDelegate adjustStoryDetailWebView]; [self setActiveStory]; } @@ -279,8 +279,8 @@ return avatarString; } -- (NSString *)getComments:(NSString *)type { - NSString *comments = @""; +- (NSString *)getComments { + NSString *comments = @"
"; if ([appDelegate.activeStory objectForKey:@"share_count"] != [NSNull null] && [[appDelegate.activeStory objectForKey:@"share_count"] intValue] > 0) { @@ -288,6 +288,42 @@ NSDictionary *story = appDelegate.activeStory; NSArray *friendsCommentsArray = [story objectForKey:@"friend_comments"]; NSArray *publicCommentsArray = [story objectForKey:@"public_comments"]; + + // 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:@ + "
" + "
%i public comment%@
" + "
", + [[story objectForKey:@"comment_count_public"] intValue], + [[story objectForKey:@"comment_count_public"] intValue] == 1 ? @"" : @"s"]; + + comments = [comments stringByAppendingString:publicCommentHeader]; + + // add friends comments + for (int i = 0; i < publicCommentsArray.count; i++) { + NSString *comment = [self getComment:[publicCommentsArray objectAtIndex:i]]; + comments = [comments stringByAppendingString:comment]; + } + } + + + comments = [comments stringByAppendingString:[NSString stringWithFormat:@"
"]]; + } + + return comments; +} + +- (NSString *)getShareBar { + NSString *comments = @""; + + if ([appDelegate.activeStory objectForKey:@"share_count"] != [NSNull null] && + [[appDelegate.activeStory objectForKey:@"share_count"] intValue] > 0) { if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { comments = [comments stringByAppendingString:[NSString stringWithFormat:@ @@ -325,32 +361,8 @@ [self getAvatars:YES] ]]; } - - - - // 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:@ - "
" - "
%i public comment%@
" - "
", - [[story objectForKey:@"comment_count_public"] intValue], - [[story objectForKey:@"comment_count_public"] intValue] == 1 ? @"" : @"s"]; - - comments = [comments stringByAppendingString:publicCommentHeader]; - - // add friends comments - for (int i = 0; i < publicCommentsArray.count; i++) { - NSString *comment = [self getComment:[publicCommentsArray objectAtIndex:i]]; - comments = [comments stringByAppendingString:comment]; - } - } - + comments = [comments stringByAppendingString:[NSString stringWithFormat:@""]]; } @@ -584,7 +596,8 @@ [appDelegate hideShareView:YES]; [appDelegate resetShareComments]; - NSString *commentString = [self getComments:@"friends"]; + NSString *shareBarString = [self getShareBar]; + NSString *commentString = [self getComments]; NSString *headerString; NSString *sharingHtmlString; NSString *footerString; @@ -673,6 +686,7 @@ "%@" // header string "" " %@" // storyHeader + " %@" // shareBar "
" "
" "
%@
" @@ -687,7 +701,8 @@ "", headerString, contentWidthClass, - storyHeader, + storyHeader, + shareBarString, fontStyleClass, fontSizeClass, [appDelegate.activeStory objectForKey:@"story_content"], @@ -696,7 +711,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]; @@ -1184,7 +1199,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request } - (void)refreshComments:(NSString *)replyId { - NSString *commentString = [self getComments:@"friends"]; + NSString *commentString = [self getComments]; NSString *jsString = [[NSString alloc] initWithFormat:@ "document.getElementById('NB-comments-wrapper').innerHTML = '%@';", commentString]; @@ -1363,7 +1378,7 @@ shouldStartLoadWithRequest:(NSURLRequest *)request if (contentWidth > 740) { contentWidthClass = @"NB-ipad-wide"; - } else if (contentWidth > 420) { + } else if (contentWidth > 500) { contentWidthClass = @"NB-ipad-narrow"; } else { contentWidthClass = @"NB-iphone"; diff --git a/media/ios/Resources-iPhone/ShareViewController.xib b/media/ios/Resources-iPhone/ShareViewController.xib index be635aeb9..9da398d16 100644 --- a/media/ios/Resources-iPhone/ShareViewController.xib +++ b/media/ios/Resources-iPhone/ShareViewController.xib @@ -38,10 +38,9 @@ - 292 + 306 {{20, 20}, {280, 114}} - _NS:9 @@ -72,7 +71,6 @@ 292 {{228, 142}, {32, 32}} - _NS:9 NO @@ -114,7 +112,6 @@ 292 {{268, 142}, {32, 32}} - _NS:9 NO @@ -141,7 +138,6 @@ {{0, 44}, {320, 436}} - 3 @@ -273,1483 +269,7 @@ 39 - - - - 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 - - - - 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 - - - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - - UIView - UIView - UIView - NewsBlurAppDelegate - UIButton - UIImageView - UIBarButtonItem - UIBarButtonItem - UIToolbar - UIButton - UIView - - - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - - - appDelegate - NewsBlurAppDelegate - - - googleReaderButton - UIButton - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - previousButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/FirstTimeUserAddFriendsViewController.h - - - - FirstTimeUserAddNewsBlurViewController - UIViewController - - id - id - id - id - - - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - - UIView - UIView - UIView - NewsBlurAppDelegate - UIButton - UIImageView - UIBarButtonItem - UIBarButtonItem - UIToolbar - UIButton - UIView - - - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - - - appDelegate - NewsBlurAppDelegate - - - googleReaderButton - UIButton - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - previousButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/FirstTimeUserAddNewsBlurViewController.h - - - - FirstTimeUserAddSitesViewController - UIViewController - - id - id - id - id - - - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - - UIView - UIView - UIView - NewsBlurAppDelegate - UIButton - UIImageView - UIBarButtonItem - UIBarButtonItem - UIToolbar - UIButton - UIView - - - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - - - appDelegate - NewsBlurAppDelegate - - - googleReaderButton - UIButton - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - previousButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/FirstTimeUserAddSitesViewController.h - - - - FirstTimeUserViewController - UIViewController - - tapNextButton - id - - - tapNextButton - - tapNextButton - id - - - - NewsBlurAppDelegate - UIImageView - UIBarButtonItem - - - - appDelegate - NewsBlurAppDelegate - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - - IBProjectSource - ./Classes/FirstTimeUserViewController.h - - - - FontSettingsViewController - UIViewController - - id - id - - - - changeFontSize: - id - - - changeFontStyle: - id - - - - NewsBlurAppDelegate - UISegmentedControl - UISegmentedControl - UILabel - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - fontSizeSegment - UISegmentedControl - - - fontStyleSegment - UISegmentedControl - - - largeFontSizeLabel - UILabel - - - smallFontSizeLabel - UILabel - - - - IBProjectSource - ./Classes/FontSettingsViewController.h - - - - FriendsListViewController - UIViewController - - NewsBlurAppDelegate - UISearchBar - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - friendSearchBar - UISearchBar - - - friendsTable - UITableView - - - - IBProjectSource - ./Classes/FriendsListViewController.h - - - - GoogleReaderViewController - UIViewController - - tapCancelButton: - id - - - tapCancelButton: - - tapCancelButton: - id - - - - NewsBlurAppDelegate - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - webView - UIWebView - - - - IBProjectSource - ./Classes/GoogleReaderViewController.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 - FeedDetailViewController - FeedsMenuViewController - NewsBlurViewController - FindSitesViewController - FirstTimeUserAddFriendsViewController - FirstTimeUserAddNewsBlurViewController - FirstTimeUserAddSitesViewController - FirstTimeUserViewController - FontSettingsViewController - FriendsListViewController - UINavigationController - GoogleReaderViewController - LoginViewController - NBContainerViewController - MoveSiteViewController - UINavigationController - OriginalStoryViewController - ShareViewController - StoryDetailViewController - UserProfileViewController - UIWindow - - - - addSiteViewController - AddSiteViewController - - - dashboardViewController - DashboardViewController - - - feedDashboardViewController - FeedDashboardViewController - - - feedDetailViewController - FeedDetailViewController - - - feedsMenuViewController - FeedsMenuViewController - - - feedsViewController - NewsBlurViewController - - - findSitesViewController - FindSitesViewController - - - firstTimeUserAddFriendsViewController - FirstTimeUserAddFriendsViewController - - - firstTimeUserAddNewsBlurViewController - FirstTimeUserAddNewsBlurViewController - - - firstTimeUserAddSitesViewController - FirstTimeUserAddSitesViewController - - - firstTimeUserViewController - FirstTimeUserViewController - - - fontSettingsViewController - FontSettingsViewController - - - friendsListViewController - FriendsListViewController - - - ftuxNavigationController - UINavigationController - - - googleReaderViewController - GoogleReaderViewController - - - loginViewController - LoginViewController - - - masterContainerViewController - NBContainerViewController - - - moveSiteViewController - MoveSiteViewController - - - navigationController - UINavigationController - - - originalStoryViewController - OriginalStoryViewController - - - shareViewController - ShareViewController - - - storyDetailViewController - StoryDetailViewController - - - 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 - - - - appDelegate - NewsBlurAppDelegate - - - feedScoreSlider - UISlider - - - feedTitlesTable - UITableView - - - feedViewToolbar - UIToolbar - - - homeButton - UIBarButtonItem - - - innerView - UIView - - - intelligenceControl - UISegmentedControl - - - - 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 - UIBarButtonItem - UIButton - - - - appDelegate - NewsBlurAppDelegate - - - commentField - UITextView - - - facebookButton - UIButton - - - submitButton - UIBarButtonItem - - - toolbarTitle - UIBarButtonItem - - - twitterButton - UIButton - - - - IBProjectSource - ./Classes/ShareViewController.h - - - - StoryDetailViewController - UIViewController - - id - id - id - id - id - id - - - - doNextStory - id - - - doNextUnreadStory - id - - - doPreviousStory - id - - - showOriginalSubview: - id - - - tapProgressBar: - id - - - toggleFontSize: - id - - - - UIBarButtonItem - NewsBlurAppDelegate - UIToolbar - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIView - UIBarButtonItem - UIView - UILabel - UIBarButtonItem - UIProgressView - UIView - UIBarButtonItem - UIToolbar - UIWebView - - - - activity - UIBarButtonItem - - - appDelegate - NewsBlurAppDelegate - - - bottomPlaceholderToolbar - UIToolbar - - - buttonAction - UIBarButtonItem - - - buttonNext - UIBarButtonItem - - - buttonNextStory - UIBarButtonItem - - - buttonPrevious - UIBarButtonItem - - - feedTitleGradient - UIView - - - fontSettingsButton - UIBarButtonItem - - - innerView - UIView - - - noStorySelectedLabel - UILabel - - - originalStoryButton - UIBarButtonItem - - - progressView - UIProgressView - - - progressViewContainer - UIView - - - subscribeButton - UIBarButtonItem - - - toolbar - UIToolbar - - - webView - UIWebView - - - - IBProjectSource - ./Classes/StoryDetailViewController.h - - - - UserProfileViewController - UIViewController - - IBProjectSource - ./Classes/UserProfileViewController.h - - - - + 0 IBCocoaTouchFramework diff --git a/media/ios/reader.css b/media/ios/reader.css index ac6bb0f6a..9ecae6463 100644 --- a/media/ios/reader.css +++ b/media/ios/reader.css @@ -3,15 +3,12 @@ } #story_pane .NB-feed-story-comments { - margin: -24px 200px 32px 28px; - padding: 1px 0 0; - max-width: 700px; - border-top: 2px solid #353535; - border-bottom: 1px solid #353535; + border-bottom: 1px solid #A6A6A6; + } #story_pane .NB-story-comment { border-top: 1px solid #A6A6A6; - background-color: #FCFCFC; + background: -webkit-gradient(linear,0% 0,0% 100%,from(#F5F9FB),to(#ECF0F2)); position: relative; padding: 0 12px 2px 72px; line-height: 20px; @@ -165,17 +162,19 @@ background-color: whiteSmoke; color: #202020; cursor: default; - text-shadow: 0 1px 0 #FFF; + text-shadow: 0 1px 0 white; font-weight: bold; text-transform: uppercase; font-size: 10px; - padding: 8px 12px 0px; + padding: 8px 12px 0; overflow: hidden; - height: 27px; + height: 26px; -webkit-transition: all .12s ease-out; -moz-transition: all .12s ease-out; -o-transition: all .12s ease-out; -ms-transition: all .12s ease-out; + background-image: -webkit-gradient(linear,left bottom,left top,color-stop(0.10,#EBEBEC),color-stop(0.84,whiteSmoke)); + background-image: -moz-linear-gradient(center bottom,#EBEBEC 10%,whiteSmoke 84%); } #story_pane .NB-story-comments-public-teaser-wrapper:hover .NB-story-comments-public-teaser { diff --git a/media/ios/sample_text.html b/media/ios/sample_text.html index 8d8b10353..7681528ac 100644 --- a/media/ios/sample_text.html +++ b/media/ios/sample_text.html @@ -1,7 +1,8 @@ -
25 Jul 2012, 1:00am
Comic for July 25, 2012
-


-

+
6:43am
Glass Half Empty
Shared by:
+

Glass Half Empty

 +

What if a glass of water was, all of a sudden, literally half empty?

+

—Vittorio Iacovella

- \ No newline at end of file + + +
ConstantineXVI
4 hours ago
"the physicist ducks"
\ No newline at end of file diff --git a/media/ios/storyDetailView.css b/media/ios/storyDetailView.css index c0551d02f..c4c1501cf 100644 --- a/media/ios/storyDetailView.css +++ b/media/ios/storyDetailView.css @@ -120,6 +120,10 @@ body { font-family: Helvetica; } +body.NB-iphone { + line-height: 110%; +} + .NB-story-author { color: #969696; text-transform: uppercase; @@ -193,6 +197,17 @@ body { line-height: 140%; } +.NB-iphone .NB-story h1, +.NB-iphone .NB-story h2, +.NB-iphone .NB-story h3, +.NB-iphone .NB-story h4, +.NB-iphone .NB-story h5, +.NB-iphone .NB-story h6 { + line-height: 120%; + font-size: 1.1em; +} + + a { text-decoration: none; } @@ -228,6 +243,10 @@ div + p { max-width: none; } +.NB-iphone .NB-header { + font-size: 14px; +} + .NB-story { overflow: hidden; }