public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iOS: merge fixes

Browse source
This commit is contained in:
David Sinclair 2015-12-11 20:00:19 -08:00
parent a4b6d881f5
commit eca77b0552
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/ios/Classes/FontSettingsViewController.m
View file

@ -366,7 +366,7 @@
[cell addSubview:self.fontSizeSegment];
[self.navigationController pushViewController:controller animated:YES];
return cell;
}
- (UITableViewCell *)makeLineSpacingTableCell {

3
clients/ios/Classes/NewsBlurAppDelegate.m
View file

@ -39,8 +39,6 @@
#import "ARChromeActivity.h"
#import "NBCopyLinkActivity.h"
#import "MBProgressHUD.h"
#import "NBSafariViewController.h"
#import "NBModalPushPopTransition.h"
#import "Utilities.h"
#import "StringHelper.h"
#import "AuthorizeServicesViewController.h"
@ -1934,7 +1932,6 @@
for (StoryDetailViewController *page in @[storyPageControl.previousPage,
storyPageControl.currentPage,
storyPageControl.nextPage]) {
if (!page) continue;
if ([[page.activeStory objectForKey:@"story_hash"]
isEqualToString:[story objectForKey:@"story_hash"]]) {
page.isRecentlyUnread = YES;