public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dejal' into catalyst

Browse source
This commit is contained in:
David Sinclair 2023-01-05 18:20:55 -06:00
commit 61a968e368
3 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2320,7 +2320,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
} }
} }
if (!everything && !infrequent && !saved && !read && !social && !widget) { if ((!everything || !appDelegate.storiesCollection.isRiverView) && !infrequent && !saved && !read && !social && !widget) {
NSString *manageText = [NSString stringWithFormat:@"Manage this %@", appDelegate.storiesCollection.isRiverView ? @"folder" : @"site"]; NSString *manageText = [NSString stringWithFormat:@"Manage this %@", appDelegate.storiesCollection.isRiverView ? @"folder" : @"site"];
[viewController addTitle:manageText iconName:@"menu_icn_move.png" selectionShouldDismiss:NO handler:^{ [viewController addTitle:manageText iconName:@"menu_icn_move.png" selectionShouldDismiss:NO handler:^{
@ -2529,7 +2529,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
__weak MenuViewController *weakViewController = viewController; __weak MenuViewController *weakViewController = viewController;
viewController.title = manageText; viewController.title = manageText;
if (!everything) { if (!everything || !appDelegate.storiesCollection.isRiverView) {
NSString *deleteText = [NSString stringWithFormat:@"Delete %@", NSString *deleteText = [NSString stringWithFormat:@"Delete %@",
appDelegate.storiesCollection.isRiverView ? appDelegate.storiesCollection.isRiverView ?
@"this entire folder" : @"this entire folder" :

10
clients/ios/Classes/FeedsObjCViewController.m
View file

@ -1476,13 +1476,21 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
count = limit; count = limit;
} }
// NSLog(@"Folder %@ contains %@ feeds", folderName, @(count)); // log
return count; return count;
} }
- (UITableViewCell *)tableView:(UITableView *)tableView - (UITableViewCell *)tableView:(UITableView *)tableView
cellForRowAtIndexPath:(NSIndexPath *)indexPath { cellForRowAtIndexPath:(NSIndexPath *)indexPath {
NSString *folderName = [appDelegate.dictFoldersArray objectAtIndex:indexPath.section]; NSString *folderName = [appDelegate.dictFoldersArray objectAtIndex:indexPath.section];
id feedId = [[appDelegate.dictFolders objectForKey:folderName] objectAtIndex:indexPath.row]; NSArray *folder = [appDelegate.dictFolders objectForKey:folderName];
if (indexPath.row >= folder.count) {
NSLog(@"Detected attempt to access row %@ of %@ when there are only %@; this will crash!", @(indexPath.row), folderName, @(folder.count)); // log
}
id feedId = [folder objectAtIndex:indexPath.row];
NSString *feedIdStr = [NSString stringWithFormat:@"%@",feedId]; NSString *feedIdStr = [NSString stringWithFormat:@"%@",feedId];
BOOL isSavedSearch = [appDelegate isSavedSearch:feedIdStr]; BOOL isSavedSearch = [appDelegate isSavedSearch:feedIdStr];
NSString *searchQuery = [appDelegate searchQueryForFeedId:feedIdStr]; NSString *searchQuery = [appDelegate searchQueryForFeedId:feedIdStr];

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

@ -606,6 +606,34 @@
<key>DefaultValue</key> <key>DefaultValue</key>
<true/> <true/>
</dict> </dict>
<dict>
<key>FooterText</key>
<string></string>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Title</key>
<string>Double tap story</string>
<key>Titles</key>
<array>
<string>Open original story</string>
<string>Show original text</string>
<string>Mark as unread</string>
<string>Save story</string>
<string>Do nothing</string>
</array>
<key>DefaultValue</key>
<string>open_original_story</string>
<key>Values</key>
<array>
<string>open_original_story</string>
<string>show_original_text</string>
<string>mark_unread</string>
<string>save_story</string>
<string>nothing</string>
</array>
<key>Key</key>
<string>double_tap_story</string>
</dict>
<dict> <dict>
<key>FooterText</key> <key>FooterText</key>
<string>Double tap with two fingers to use this gesture.</string> <string>Double tap with two fingers to use this gesture.</string>