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

#1332 (muting tweaks)

Browse source 
- Fixed all muted sites becoming unmuted when muting via feed detail.
- Fixed OFF label display bug.
This commit is contained in:
David Sinclair 2020-06-18 21:10:46 -07:00
parent 3ac2346184
commit 155c14b4e3
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
clients/ios/Classes/FeedChooserViewController.m
View file

@ -122,16 +122,14 @@ static const CGFloat kFolderTitleHeight = 36.0;
[self rebuildItemsAnimated:NO];
dispatch_async(dispatch_get_main_queue(), ^{
[self enumerateAllRowsUsingBlock:^(NSIndexPath *indexPath, FeedChooserItem *item) {
if (![item.info[@"active"] boolValue]) {
[self.tableView selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
}
}];
[self updateControls];
[MBProgressHUD hideHUDForView:self.view animated:YES];
});
[self enumerateAllRowsUsingBlock:^(NSIndexPath *indexPath, FeedChooserItem *item) {
if (![item.info[@"active"] boolValue]) {
[self.tableView selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
}
}];
[self updateControls];
[MBProgressHUD hideHUDForView:self.view animated:YES];
}
- (void)finishedWithError:(NSError *)error {
@ -736,8 +734,9 @@ static const CGFloat kFolderTitleHeight = 36.0;
if (self.operation == FeedChooserOperationMuteSites) {
UIImage *image = [UIImage imageNamed:@"mute_feed_on.png"];
UIImage *highlightedImage = [UIImage imageNamed:@"mute_feed_off.png"];
cell.accessoryView = [[UIImageView alloc] initWithImage:image highlightedImage:highlightedImage];
UIImageView *imageView = [[UIImageView alloc] initWithImage:image highlightedImage:highlightedImage];
imageView.highlighted = [tableView.indexPathsForSelectedRows containsObject:indexPath];
cell.accessoryView = imageView;
} else {
cell.accessoryView = nil;
}
@ -780,6 +779,10 @@ static const CGFloat kFolderTitleHeight = 36.0;
[self setWidgetIncludes:YES itemForIndexPath:indexPath];
}
UIImageView *imageView = (UIImageView *)[tableView cellForRowAtIndexPath:indexPath].accessoryView;
imageView.highlighted = YES;
[self updateControls];
}
@ -788,6 +791,10 @@ static const CGFloat kFolderTitleHeight = 36.0;
[self setWidgetIncludes:NO itemForIndexPath:indexPath];
}
UIImageView *imageView = (UIImageView *)[tableView cellForRowAtIndexPath:indexPath].accessoryView;
imageView.highlighted = NO;
[self updateControls];
}

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

@ -2491,6 +2491,10 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
NSString *thisIdentifier = [NSString stringWithFormat:@"%@", storiesCollection.activeFeed[@"id"]];
[activeIdentifiers removeObject:thisIdentifier];
for (NSString *feedId in self.appDelegate.dictInactiveFeeds.allKeys) {
[activeIdentifiers removeObject:feedId];
}
NSMutableDictionary *params = [NSMutableDictionary dictionary];
NSString *urlString = [NSString stringWithFormat:@"%@/reader/save_feed_chooser", self.appDelegate.url];