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

#1495 (Shift-A to Mark All as Read)

Browse source
This commit is contained in:
David Sinclair 2021-06-03 20:33:41 -07:00
parent e53123c9bd
commit 9708c2f567
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
clients/ios/Classes/FeedDetailObjCViewController.m
View file

@ -37,6 +37,13 @@
#define kTableViewRiverRowHeight 72; #define kTableViewRiverRowHeight 72;
#define kTableViewShortRowDifference 16; #define kTableViewShortRowDifference 16;
typedef NS_ENUM(NSUInteger, MarkReadShowMenu)
{
MarkReadShowMenuNever = 0,
MarkReadShowMenuBasedOnPref,
MarkReadShowMenuAlways
};
@interface FeedDetailObjCViewController () @interface FeedDetailObjCViewController ()
@property (nonatomic) NSUInteger scrollingMarkReadRow; @property (nonatomic) NSUInteger scrollingMarkReadRow;
@ -172,6 +179,8 @@
[self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.notifier attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:NOTIFIER_HEIGHT]]; [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.notifier attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:NOTIFIER_HEIGHT]];
self.notifier.topOffsetConstraint = [NSLayoutConstraint constraintWithItem:self.notifier attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0]; self.notifier.topOffsetConstraint = [NSLayoutConstraint constraintWithItem:self.notifier attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0];
[self.view addConstraint:self.notifier.topOffsetConstraint]; [self.view addConstraint:self.notifier.topOffsetConstraint];
[self addKeyCommandWithInput:@"a" modifierFlags:UIKeyModifierShift action:@selector(doMarkAllRead:) discoverabilityTitle:@"Mark All as Read"];
} }
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch { - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
@ -2031,7 +2040,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
- (void)handleMarkReadLongPress:(UILongPressGestureRecognizer *)gestureRecognizer { - (void)handleMarkReadLongPress:(UILongPressGestureRecognizer *)gestureRecognizer {
if (gestureRecognizer.state != UIGestureRecognizerStateBegan) return; if (gestureRecognizer.state != UIGestureRecognizerStateBegan) return;
[self doOpenMarkReadMenu:nil]; [self markReadShowMenu:MarkReadShowMenuAlways sender:nil];
} }
- (void)showMarkOlderNewerOptionsForStory:(NSDictionary *)story indexPath:(NSIndexPath *)indexPath cell:(FeedDetailTableCell *)cell { - (void)showMarkOlderNewerOptionsForStory:(NSDictionary *)story indexPath:(NSIndexPath *)indexPath cell:(FeedDetailTableCell *)cell {
@ -2105,7 +2114,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
}]; }];
} }
- (IBAction)doOpenMarkReadMenu:(id)sender { - (void)markReadShowMenu:(MarkReadShowMenu)showMenu sender:(id)sender {
[self.appDelegate hidePopoverAnimated:YES]; [self.appDelegate hidePopoverAnimated:YES];
void (^pop)(void) = ^{ void (^pop)(void) = ^{
@ -2128,7 +2137,11 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
NSArray *feedIds = storiesCollection.isRiverView ? [self.appDelegate feedIdsForFolderTitle:storiesCollection.activeFolder] : @[storiesCollection.activeFeed[@"id"]]; NSArray *feedIds = storiesCollection.isRiverView ? [self.appDelegate feedIdsForFolderTitle:storiesCollection.activeFolder] : @[storiesCollection.activeFeed[@"id"]];
NSString *confirmPref = [[NSUserDefaults standardUserDefaults] stringForKey:@"default_confirm_read_filter"]; NSString *confirmPref = [[NSUserDefaults standardUserDefaults] stringForKey:@"default_confirm_read_filter"];
if (sender && ([confirmPref isEqualToString:@"never"] || ([confirmPref isEqualToString:@"folders"] && !storiesCollection.isRiverView))) { if (showMenu == MarkReadShowMenuNever) {
[self.appDelegate.feedsViewController markFeedsRead:feedIds cutoffDays:0];
pop();
return;
} else if (showMenu == MarkReadShowMenuBasedOnPref && ([confirmPref isEqualToString:@"never"] || ([confirmPref isEqualToString:@"folders"] && !storiesCollection.isRiverView))) {
[self.appDelegate.feedsViewController markFeedsRead:feedIds cutoffDays:0]; [self.appDelegate.feedsViewController markFeedsRead:feedIds cutoffDays:0];
pop(); pop();
return; return;
@ -2156,6 +2169,14 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
}]; }];
} }
- (IBAction)doOpenMarkReadMenu:(id)sender {
[self markReadShowMenu:MarkReadShowMenuBasedOnPref sender:sender];
}
- (IBAction)doMarkAllRead:(id)sender {
[self markReadShowMenu:MarkReadShowMenuNever sender:nil];
}
- (BOOL)isRiver { - (BOOL)isRiver {
return appDelegate.storiesCollection.isSocialRiverView || return appDelegate.storiesCollection.isSocialRiverView ||
appDelegate.storiesCollection.isSocialView || appDelegate.storiesCollection.isSocialView ||