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

Adding mark read button for ipad when story titles on bottom.

Browse source
This commit is contained in:
Samuel Clay 2017-11-01 22:19:26 -07:00
parent f2ce4b7ca0
commit af23adda97
4 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clients/ios/Classes/FeedDetailViewController.h
View file

@ -88,6 +88,7 @@
- (void)loadStory:(FeedDetailTableCell *)cell atRow:(NSInteger)row;
- (void)redrawUnreadStory;
- (IBAction)doOpenMarkReadMenu:(id)sender;
- (IBAction)doOpenMarkReadMenu:(id)sender;
- (IBAction)doOpenSettingsMenu:(id)sender;
- (void)confirmDeleteSite;
- (void)confirmMuteSite;

5
clients/ios/Classes/FeedDetailViewController.m
View file

@ -1849,7 +1849,10 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
visibleUnreadCount = 0;
}
[self.appDelegate showMarkReadMenuWithFeedIds:feedIds collectionTitle:collectionTitle visibleUnreadCount:visibleUnreadCount barButtonItem:self.feedMarkReadButton completionHandler:^(BOOL marked){
UIBarButtonItem *barButton = self.feedMarkReadButton;
if (sender && [sender isKindOfClass:[UIBarButtonItem class]]) barButton = sender;
[self.appDelegate showMarkReadMenuWithFeedIds:feedIds collectionTitle:collectionTitle visibleUnreadCount:visibleUnreadCount barButtonItem:barButton completionHandler:^(BOOL marked){
if (marked) {
pop();
}

2
clients/ios/Classes/StoryPageControl.h
View file

@ -19,6 +19,8 @@
UIButton *buttonPrevious;
UIButton *buttonNext;
UIButton *buttonText;
UIBarButtonItem *markReadBarButton;
UIBarButtonItem *separatorBarButton2;
UIActivityIndicatorView *loadingIndicator;
UIBarButtonItem *buttonBack;
UIView *traverseView;

33
clients/ios/Classes/StoryPageControl.m
View file

@ -162,7 +162,19 @@
target:self
action:@selector(showOriginalSubview:)];
originalStoryButton.accessibilityLabel = @"Show original story";
separatorBarButton2 = [UIBarButtonItem barItemWithImage:separatorImage
target:nil
action:nil];
[separatorBarButton2 setEnabled:NO];
separatorBarButton2.isAccessibilityElement = NO;
UIImage *markReadImage = [UIImage imageNamed:@"markread.png"];
markReadBarButton = [UIBarButtonItem barItemWithImage:markReadImage
target:self
action:@selector(markAllRead:)];
markReadBarButton.accessibilityLabel = @"Mark all as read";
UIBarButtonItem *subscribeBtn = [[UIBarButtonItem alloc]
initWithTitle:@"Follow User"
style:UIBarButtonItemStylePlain
@ -939,10 +951,19 @@
// [self.view setNeedsLayout];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects:
originalStoryButton,
separatorBarButton,
fontSettingsButton, nil];
if (appDelegate.masterContainerViewController.storyTitlesOnLeft) {
self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects:
originalStoryButton,
separatorBarButton,
fontSettingsButton, nil];
} else {
self.navigationItem.rightBarButtonItems = [NSArray arrayWithObjects:
originalStoryButton,
separatorBarButton,
fontSettingsButton,
separatorBarButton2,
markReadBarButton, nil];
}
}
[self setNextPreviousButtons];
@ -971,6 +992,10 @@
#pragma mark -
#pragma mark Actions
- (IBAction)markAllRead:(id)sender {
[appDelegate.feedDetailViewController doOpenMarkReadMenu:markReadBarButton];
}
- (void)setNextPreviousButtons {
// setting up the PREV BUTTON
NSInteger readStoryCount = [appDelegate.readStories count];