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

Merge branch 'dejal' into catalyst

Browse source 
# Conflicts:
#	clients/ios/Classes/FeedDetailObjCViewController.m
This commit is contained in:
David Sinclair 2022-09-25 19:35:25 -06:00
commit 3705f73bc7
9 changed files with 193 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/ios/Classes/FeedDetailCollectionCell.m
View file

@ -347,7 +347,7 @@ static UIFont *indicatorFont = nil;
}
int storyTitleX = leftMargin;
if (cell.isSaved) {
UIImage *savedIcon = [UIImage imageNamed:@"clock"];
UIImage *savedIcon = [UIImage imageNamed:@"saved-stories"];
[savedIcon drawInRect:CGRectMake(storyTitleX, storyTitleY - 1, 16, 16) blendMode:0 alpha:1];
storyTitleX += 22;
}

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

@ -1844,8 +1844,12 @@ typedef NS_ENUM(NSUInteger, MarkReadShowMenu)
NSDictionary *story = [self getStoryAtRow:indexPath.row];
NSString *content = [story[@"story_content"] convertHTML];
if (content.length < 50 && [story[@"story_title"] length] < 30) {
if (content.length < 10 && [story[@"story_title"] length] < 30) {
return height;
} else if (content.length < 50 && [story[@"story_title"] length] < 30) {
return height + font.pointSize * 2;
} else if (content.length < 50 && [story[@"story_title"] length] < 40) {
return height + font.pointSize * 3;
} else if (content.length < 50 && [story[@"story_title"] length] >= 30) {
return height + font.pointSize * 5;
} else if (content.length < 100) {
@ -2154,8 +2158,15 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state
[self reloadStories];
}
// Don't do this, as it causes a race condition with the marking read call
// [self.appDelegate.feedsViewController refreshFeedList];
// [self.appDelegate.feedsViewController refreshFeedList];
[self.appDelegate.feedsViewController reloadFeedTitlesTable];
[self.appDelegate showFeedsListAnimated:YES];
NSString *loadNextPref = [[NSUserDefaults standardUserDefaults] stringForKey:@"after_mark_read"];
if (![loadNextPref isEqualToString:@"stay"]) {
[self.appDelegate.feedsViewController selectNextFolderOrFeed];
}
};
[storiesCollection calculateStoryLocations];

1
clients/ios/Classes/FeedsObjCViewController.h
View file

@ -93,6 +93,7 @@ UIGestureRecognizerDelegate, UISearchBarDelegate> {
- (void)finishLoadingFeedListWithDict:(NSDictionary *)results finished:(BOOL)finished;
- (void)didSelectSectionHeader:(UIButton *)button;
- (void)didSelectSectionHeaderWithTag:(NSInteger)tag;
- (void)selectNextFolderOrFeed;
- (IBAction)selectIntelligence;
- (void)markFeedRead:(NSString *)feedId cutoffDays:(NSInteger)days;
- (void)markFeedsRead:(NSArray *)feedIds cutoffDays:(NSInteger)days;

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

@ -50,6 +50,8 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
@property (nonatomic) NSDate *leftAppDate;
@property (nonatomic, strong) NSMutableDictionary<NSIndexPath *, NSNumber *> *rowHeights;
@property (nonatomic, strong) NSMutableDictionary<NSNumber *, FolderTitleView *> *folderTitleViews;
@property (nonatomic, strong) NSIndexPath *lastRowAtIndexPath;
@property (nonatomic) NSInteger lastSection;
@end
@ -203,12 +205,18 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
self.currentRowAtIndexPath = nil;
self.currentSection = NewsBlurTopSectionAllStories;
self.lastRowAtIndexPath = nil;
self.lastSection = NewsBlurTopSectionAllStories;
userAvatarButton.hidden = YES;
self.noFocusMessage.hidden = YES;
// [self.navigationController.interactivePopGestureRecognizer addTarget:self action:@selector(handleGesture:)];
[self addKeyCommandWithInput:UIKeyInputDownArrow modifierFlags:UIKeyModifierAlternate action:@selector(selectNextFeed:) discoverabilityTitle:@"Next Site" wantPriority:YES];
[self addKeyCommandWithInput:UIKeyInputUpArrow modifierFlags:UIKeyModifierAlternate action:@selector(selectPreviousFeed:) discoverabilityTitle:@"Previous Site" wantPriority:YES];
[self addKeyCommandWithInput:UIKeyInputDownArrow modifierFlags:UIKeyModifierShift action:@selector(selectNextFolder:) discoverabilityTitle:@"Next Folder" wantPriority:YES];
[self addKeyCommandWithInput:UIKeyInputUpArrow modifierFlags:UIKeyModifierShift action:@selector(selectPreviousFolder:) discoverabilityTitle:@"Previous Folder" wantPriority:YES];
[self addKeyCommandWithInput:@"e" modifierFlags:UIKeyModifierCommand action:@selector(selectEverything:) discoverabilityTitle:@"Open All Stories"];
[self addKeyCommandWithInput:UIKeyInputLeftArrow modifierFlags:0 action:@selector(selectPreviousIntelligence:) discoverabilityTitle:@"Switch Views"];
[self addKeyCommandWithInput:UIKeyInputRightArrow modifierFlags:0 action:@selector(selectNextIntelligence:) discoverabilityTitle:@"Switch Views"];
@ -1588,6 +1596,8 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
// set the current row pointer
self.currentRowAtIndexPath = indexPath;
self.currentSection = -1;
self.lastRowAtIndexPath = indexPath;
self.lastSection = -1;
NSString *folderName = appDelegate.dictFoldersArray[indexPath.section];
id feedId = [[appDelegate.dictFolders objectForKey:folderName] objectAtIndex:indexPath.row];
@ -1876,6 +1886,8 @@ heightForHeaderInSection:(NSInteger)section {
// reset pointer to the cells
self.currentRowAtIndexPath = nil;
self.currentSection = tag;
self.lastRowAtIndexPath = nil;
self.lastSection = tag;
[self highlightSelection];
@ -1890,6 +1902,124 @@ heightForHeaderInSection:(NSInteger)section {
[appDelegate loadRiverFeedDetailView:appDelegate.feedDetailViewController withFolder:folder];
}
- (NSArray *)allIndexPaths {
NSMutableArray *array = [NSMutableArray array];
for (NSInteger section = 0; section < self.feedTitlesTable.numberOfSections; section++) {
for (NSInteger row = 0; row < [self.feedTitlesTable numberOfRowsInSection:section]; row++) {
[array addObject:[NSIndexPath indexPathForRow:row inSection:section]];
}
}
return array;
}
- (void)selectNextFolderOrFeed {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.3 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
if (self.lastRowAtIndexPath != nil) {
[self selectNextFeed:nil];
} else {
[self selectNextFolder:nil];
}
});
}
- (void)selectNextFeed:(id)sender {
NSArray *indexPaths = [self allIndexPaths];
NSIndexPath *indexPath = self.lastRowAtIndexPath;
if (indexPath == nil) {
if (self.lastSection < 0) {
indexPath = indexPaths.firstObject;
} else {
indexPath = [NSIndexPath indexPathForRow:0 inSection:self.lastSection];
}
} else {
NSInteger index = [indexPaths indexOfObject:indexPath];
if (index == NSNotFound) {
index = -1;
}
index += 1;
if (index >= indexPaths.count) {
index = 0;
}
indexPath = indexPaths[index];
}
[self.feedTitlesTable selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionMiddle];
[self tableView:self.feedTitlesTable didSelectRowAtIndexPath:indexPath];
}
- (void)selectPreviousFeed:(id)sender {
NSArray *indexPaths = [self allIndexPaths];
NSIndexPath *indexPath = self.lastRowAtIndexPath;
if (indexPath == nil) {
if (self.lastSection < 0) {
indexPath = indexPaths.firstObject;
} else {
indexPath = [NSIndexPath indexPathForRow:0 inSection:self.lastSection];
}
}
NSInteger index = [indexPaths indexOfObject:indexPath];
if (index == NSNotFound) {
index = 0;
}
index -= 1;
if (index < 0) {
index = indexPaths.count - 1;
}
indexPath = indexPaths[index];
[self.feedTitlesTable selectRowAtIndexPath:indexPath animated:YES scrollPosition:UITableViewScrollPositionMiddle];
[self tableView:self.feedTitlesTable didSelectRowAtIndexPath:indexPath];
}
- (void)selectNextFolder:(id)sender {
NSInteger section = self.lastSection;
if (section < self.feedTitlesTable.numberOfSections - 1) {
section += 1;
} else {
section = 0;
}
[self didSelectSectionHeaderWithTag:section];
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:section];
if ([self.feedTitlesTable numberOfRowsInSection:section] > 0) {
[self.feedTitlesTable scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionMiddle animated:YES];
}
}
- (void)selectPreviousFolder:(id)sender {
NSInteger section = self.lastSection;
if (section > 0) {
section -= 1;
} else {
section = self.feedTitlesTable.numberOfSections - 1;
}
[self didSelectSectionHeaderWithTag:section];
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:0 inSection:section];
if ([self.feedTitlesTable numberOfRowsInSection:section] > 0) {
[self.feedTitlesTable scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionMiddle animated:YES];
}
}
- (void)selectEverything:(id)sender {
[self didSelectSectionHeaderWithTag:NewsBlurTopSectionAllStories];
}

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

@ -42,7 +42,8 @@
NSString *folderName = appDelegate.dictFoldersArray[section];
NSString *collapseKey = [NSString stringWithFormat:@"folderCollapsed:%@", folderName];
bool isFolderCollapsed = [userPreferences boolForKey:collapseKey];
BOOL isFolderCollapsed = [userPreferences boolForKey:collapseKey];
BOOL isSavedStoriesFeed = self.appDelegate.isSavedStoriesIntelligenceMode;
NSInteger countWidth = 0;
NSString *accessibilityCount = @"";
NSArray *folderComponents = [folderName componentsSeparatedByString:@" ▸ "];
@ -77,7 +78,7 @@
[self addSubview:unreadCount];
accessibilityCount = [NSString stringWithFormat:@", %@ searches", @(count)];
} else if (isFolderCollapsed) {
} else if (isFolderCollapsed && !isSavedStoriesFeed) {
UnreadCounts *counts = [appDelegate splitUnreadCountForFolder:folderName];
unreadCount = [[UnreadCountView alloc] initWithFrame:CGRectMake(rect.origin.x, 0, CGRectGetWidth(rect), CGRectGetHeight(rect))];
unreadCount.appDelegate = appDelegate;
@ -287,7 +288,7 @@
[customView setAutoresizingMask:UIViewAutoresizingNone];
if (isFolderCollapsed) {
if (isFolderCollapsed && !isSavedStoriesFeed) {
[self insertSubview:customView belowSubview:unreadCount];
} else {
[self addSubview:customView];

2
clients/ios/Other Sources/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
View file

@ -215,6 +215,8 @@ CGRect IASKCGRectSwap(CGRect rect);
[dc addObserver:self selector:@selector(didChangeSettingViaIASK:) name:kIASKAppSettingChanged object:nil];
[self userDefaultsDidChange]; // force update in case of changes while we were hidden
}
self.overrideUserInterfaceStyle = ThemeManager.shared.isDarkTheme ? UIUserInterfaceStyleDark : UIUserInterfaceStyleLight;
}
- (CGSize)preferredContentSize {

2
clients/ios/Other Sources/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m
View file

@ -65,6 +65,8 @@
_selection.tableView = _tableView;
}
self.didFirstLayout = NO;
self.overrideUserInterfaceStyle = ThemeManager.shared.isDarkTheme ? UIUserInterfaceStyleDark : UIUserInterfaceStyleLight;
[super viewWillAppear:animated];
}

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

@ -94,6 +94,26 @@
<key>Key</key>
<string>default_confirm_read_filter</string>
</dict>
<dict>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Title</key>
<string>After mark read</string>
<key>Titles</key>
<array>
<string>Open the next site/folder</string>
<string>Stay on the feeds list</string>
</array>
<key>DefaultValue</key>
<string>next</string>
<key>Values</key>
<array>
<string>next</string>
<string>stay</string>
</array>
<key>Key</key>
<string>after_mark_read</string>
</dict>
<dict>
<key>Type</key>
<string>PSMultiValueSpecifier</string>

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

@ -94,6 +94,26 @@
<key>Key</key>
<string>default_confirm_read_filter</string>
</dict>
<dict>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
<key>Title</key>
<string>After mark read</string>
<key>Titles</key>
<array>
<string>Open the next site/folder</string>
<string>Stay on the feeds list</string>
</array>
<key>DefaultValue</key>
<string>next</string>
<key>Values</key>
<array>
<string>next</string>
<string>stay</string>
</array>
<key>Key</key>
<string>after_mark_read</string>
</dict>
<dict>
<key>Type</key>
<string>PSMultiValueSpecifier</string>