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

#1325 (show muted sites in All feeds view)

Browse source 
- Fixed the Mute Sites view not showing the OFF state correctly when initially displayed.
This commit is contained in:
David Sinclair 2020-06-15 16:14:16 -07:00
parent ca8e995d79
commit aeb98505b9
4 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -122,14 +122,16 @@ static const CGFloat kFolderTitleHeight = 36.0;
[self rebuildItemsAnimated:NO];
[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];
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];
});
}
- (void)finishedWithError:(NSError *)error {

12
clients/ios/Classes/NewsBlurViewController.m
View file

@ -489,6 +489,14 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
NSLog(@"Fetching feed list");
[appDelegate cancelOfflineQueue];
//TODO: want to include inactive for #1325 (show muted sites in All feeds view)
// if (self.inPullToRefresh_) {
// urlFeedList = [NSString stringWithFormat:@"%@/reader/feeds?flat=true&update_counts=true&include_inactive=true",
// self.appDelegate.url];
// } else {
// urlFeedList = [NSString stringWithFormat:@"%@/reader/feeds?flat=true&update_counts=false&include_inactive=true",
// self.appDelegate.url];
// }
if (self.inPullToRefresh_) {
urlFeedList = [NSString stringWithFormat:@"%@/reader/feeds?flat=true&update_counts=true",
self.appDelegate.url];
@ -706,6 +714,10 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
// set up dictFolders
NSMutableDictionary * allFolders = [[NSMutableDictionary alloc] init];
//TODO: want to include inactive for #1325 (show muted sites in All feeds view)
// if (![[results objectForKey:@"flat_folders_with_inactive"] isKindOfClass:[NSArray class]]) {
// allFolders = [[results objectForKey:@"flat_folders_with_inactive"] mutableCopy];
// }
if (![[results objectForKey:@"flat_folders"] isKindOfClass:[NSArray class]]) {
allFolders = [[results objectForKey:@"flat_folders"] mutableCopy];
}

4
clients/ios/NewsBlur.xcodeproj/project.pbxproj
View file

@ -12,6 +12,7 @@
17042DB92391D68A001BCD32 /* WidgetStory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17042DB82391D68A001BCD32 /* WidgetStory.swift */; };
17042DBB23922A4D001BCD32 /* WidgetLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17042DBA23922A4D001BCD32 /* WidgetLoader.swift */; };
1715D02B2166B3F900227731 /* PremiumManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1715D02A2166B3F900227731 /* PremiumManager.m */; };
1721C9D12497F91A00B0EDC4 /* mute_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 1721C9D02497F91900B0EDC4 /* mute_gray.png */; };
17362ADD23639B4E00A0FCCC /* OfflineFetchText.m in Sources */ = {isa = PBXBuildFile; fileRef = 17362ADC23639B4E00A0FCCC /* OfflineFetchText.m */; };
1740C6881C10FD75005EA453 /* theme_color_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 1740C6841C10FD75005EA453 /* theme_color_dark.png */; };
1740C6891C10FD75005EA453 /* theme_color_light.png in Resources */ = {isa = PBXBuildFile; fileRef = 1740C6851C10FD75005EA453 /* theme_color_light.png */; };
@ -666,6 +667,7 @@
17042DBA23922A4D001BCD32 /* WidgetLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetLoader.swift; sourceTree = "<group>"; };
1715D0292166B3F900227731 /* PremiumManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PremiumManager.h; sourceTree = "<group>"; };
1715D02A2166B3F900227731 /* PremiumManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PremiumManager.m; sourceTree = "<group>"; };
1721C9D02497F91900B0EDC4 /* mute_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mute_gray.png; sourceTree = "<group>"; };
17362ADB23639B4E00A0FCCC /* OfflineFetchText.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OfflineFetchText.h; path = offline/OfflineFetchText.h; sourceTree = "<group>"; };
17362ADC23639B4E00A0FCCC /* OfflineFetchText.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = OfflineFetchText.m; path = offline/OfflineFetchText.m; sourceTree = "<group>"; };
1740C6841C10FD75005EA453 /* theme_color_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = theme_color_dark.png; sourceTree = "<group>"; };
@ -1930,6 +1932,7 @@
1761295D1C630AEB00702FE4 /* mute_feed_off@2x.png */,
1761295E1C630AEB00702FE4 /* mute_feed_on.png */,
1761295F1C630AEB00702FE4 /* mute_feed_on@2x.png */,
1721C9D02497F91900B0EDC4 /* mute_gray.png */,
FF1104601769695A00502C29 /* g_icn_offline@2x.png */,
FFC518B81768E59F00542719 /* g_icn_offline.png */,
17AACFD822279A3900DE6EA4 /* autoscroll_off.png */,
@ -3082,6 +3085,7 @@
FF5F3A87162B834E008DBE3E /* bin_closed.png in Resources */,
17AACFE622279A3C00DE6EA4 /* autoscroll_faster.png in Resources */,
FF5F3A89162B8377008DBE3E /* arrow_branch.png in Resources */,
1721C9D12497F91A00B0EDC4 /* mute_gray.png in Resources */,
FF5F3A8B162B8390008DBE3E /* car.png in Resources */,
FF41309D162CEC7100DDB6A7 /* time.png in Resources */,
FF4130A0162CECAE00DDB6A7 /* email.png in Resources */,

BIN
clients/ios/Resources/mute_gray.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB