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

Adding preference to hide global shared stories and infrequent site stories. Also moving infrequent site stories above all stories on both ios and web.

Browse source
This commit is contained in:
Samuel Clay 2017-12-15 16:16:43 -08:00
parent 059e47118a
commit ef7ba42242
5 changed files with 75 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -120,9 +120,9 @@
} else if (section == 1) {
folderTitle = [@"All Shared Stories" uppercaseString];
} else if (section == 2) {
folderTitle = [@"All Stories" uppercaseString];
} else if (section == 3) {
folderTitle = [@"Infrequent Site Stories" uppercaseString];
} else if (section == 3) {
folderTitle = [@"All Stories" uppercaseString];
} else if ([folderName isEqual:@"read_stories"]) {
folderTitle = [@"Read Stories" uppercaseString];
} else if ([folderName isEqual:@"saved_stories"]) {

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

@ -647,7 +647,7 @@ static UIFont *userLabelFont;
NSArray *folder = [appDelegate.dictFolders objectForKey:f];
NSString *folderTitle;
if ([f isEqualToString:@" "]) {
folderTitle = @"infrequent";
folderTitle = @"everything";
} else {
folderTitle = f;
}
@ -678,7 +678,6 @@ static UIFont *userLabelFont;
appDelegate.dictFolders = sortedFolders;
[appDelegate.dictFoldersArray sortUsingSelector:@selector(caseInsensitiveCompare:)];
// Move River Blurblog and Everything to the top
[appDelegate.dictFoldersArray removeObject:@"river_global"];
[appDelegate.dictFoldersArray insertObject:@"river_global" atIndex:0];
@ -686,12 +685,12 @@ static UIFont *userLabelFont;
[appDelegate.dictFoldersArray removeObject:@"river_blurblogs"];
[appDelegate.dictFoldersArray insertObject:@"river_blurblogs" atIndex:1];
[appDelegate.dictFoldersArray removeObject:@"everything"];
[appDelegate.dictFoldersArray insertObject:@"everything" atIndex:2];
// Add Infrequent folder
[appDelegate.dictFoldersArray removeObject:@"infrequent"];
[appDelegate.dictFoldersArray insertObject:@"infrequent" atIndex:3];
[appDelegate.dictFoldersArray insertObject:@"infrequent" atIndex:2];
[appDelegate.dictFoldersArray removeObject:@"everything"];
[appDelegate.dictFoldersArray insertObject:@"everything" atIndex:3];
// Add Read Stories folder
[appDelegate.dictFoldersArray removeObject:@"read_stories"];
@ -1169,9 +1168,9 @@ static UIFont *userLabelFont;
} else if (indexPath.section == 1) {
folderName = @"river_blurblogs";
} else if (indexPath.section == 2) {
folderName = @"everything";
} else if (indexPath.section == 3) {
folderName = @"infrequent";
} else if (indexPath.section == 3) {
folderName = @"everything";
} else {
folderName = [appDelegate.dictFoldersArray objectAtIndex:indexPath.section];
}
@ -1212,6 +1211,7 @@ static UIFont *userLabelFont;
- (CGFloat)tableView:(UITableView *)tableView
heightForRowAtIndexPath:(NSIndexPath *)indexPath {
NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
if (appDelegate.hasNoSites) {
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
return kBlurblogTableViewRowHeight;
@ -1228,7 +1228,7 @@ static UIFont *userLabelFont;
} else {
folderName = [appDelegate.dictFoldersArray objectAtIndex:indexPath.section];
}
bool isFolderCollapsed = [appDelegate isFolderCollapsed:folderName];
if (isFolderCollapsed) {
return 0;
@ -1314,6 +1314,8 @@ static UIFont *userLabelFont;
- (CGFloat)tableView:(UITableView *)tableView
heightForHeaderInSection:(NSInteger)section {
NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
if ([appDelegate.dictFoldersArray count] == 0) return 0;
NSString *folderName = [appDelegate.dictFoldersArray objectAtIndex:section];
@ -1325,6 +1327,16 @@ heightForHeaderInSection:(NSInteger)section {
return 0;
}
if ([folderName isEqualToString:@"infrequent"] &&
![prefs boolForKey:@"show_infrequent_site_stories"]) {
return 0;
}
if ([folderName isEqualToString:@"river_global"] &&
![prefs boolForKey:@"show_global_shared_stories"]) {
return 0;
}
UIFontDescriptor *fontDescriptor = [self fontDescriptorUsingPreferredSize:UIFontTextStyleCaption1];
UIFont *font = [UIFont fontWithDescriptor:fontDescriptor size:0.0];
NSInteger height = kFolderTitleHeight;
@ -1351,9 +1363,9 @@ heightForHeaderInSection:(NSInteger)section {
} else if (tag == 1) {
folder = @"river_blurblogs";
} else if (tag == 2) {
folder = @"everything";
} else if (tag == 3) {
folder = @"infrequent";
} else if (tag == 3) {
folder = @"everything";
} else {
folder = [NSString stringWithFormat:@"%ld", (long)tag];
}

20
clients/ios/Resources/Settings.bundle/Root.plist
View file

@ -122,6 +122,26 @@
<key>Key</key>
<string>infrequent_stories_per_month</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Show Infrequent Site Stories</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
<string>show_infrequent_site_stories</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Show Global Shared Stories</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
<string>show_global_shared_stories</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>

20
clients/ios/Resources/Settings.bundle/Root~ipad.plist
View file

@ -122,6 +122,26 @@
<key>Key</key>
<string>infrequent_stories_per_month</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Show Infrequent Site Stories</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
<string>show_infrequent_site_stories</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Show Global Shared Stories</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
<string>show_global_shared_stories</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>

20
templates/reader/feeds_skeleton.xhtml
View file

@ -69,16 +69,6 @@
<ul class="NB-socialfeeds NB-feedlist"></ul>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-sites-container">
<div class="NB-feeds-header NB-feeds-header-river-sites NB-empty">
<div class="NB-feeds-header-count unread_count"></div>
<div class="NB-feeds-header-icon"></div>
<div class="NB-feeds-header-title">
All Site Stories
</div>
</div>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-infrequent-container">
<div class="NB-feeds-header NB-feeds-header-river-infrequent NB-empty">
<div class="NB-feeds-header-count unread_count"></div>
@ -89,6 +79,16 @@
</div>
</div>
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-sites-container">
<div class="NB-feeds-header NB-feeds-header-river-sites NB-empty">
<div class="NB-feeds-header-count unread_count"></div>
<div class="NB-feeds-header-icon"></div>
<div class="NB-feeds-header-title">
All Site Stories
</div>
</div>
</div>
<ul class="folder NB-feedlist" id="feed_list"></ul>
<div class="NB-feeds-header-container NB-feeds-header-read-container NB-hidden">