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

#1720 (Grid view)

Browse source 
- Improved glitches with iPad grid view.
- Fixed stories being marked as read while scrolling from a long story to a short story.
This commit is contained in:
David Sinclair 2023-08-29 16:33:12 -06:00
parent 41768bed14
commit a7ca7f0fa2
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/ios/Classes/FeedDetailStoryView.swift
View file

@ -98,7 +98,7 @@ struct StoryPagesView: UIViewControllerRepresentable {
let size = storyPagesViewController.currentPage.webView.scrollView.contentSize
storyPagesViewController.preferredContentSize = CGSize(width: size.width, height: 200)
storyPagesViewController.preferredContentSize = CGSize(width: size.width, height: 1000)
storyPagesViewController.currentPage.webView.evaluateJavaScript(
"document.body.lastChild.getBoundingClientRect().bottom + window.scrollY"

12
clients/ios/Classes/FeedDetailViewController.swift
View file

@ -136,6 +136,8 @@ class FeedDetailViewController: FeedDetailObjCViewController {
var pendingStories = [Story.ID : Story]()
var suppressMarkAsRead = false
func deferredReload(story: Story? = nil) {
reloadWorkItem?.cancel()
@ -241,7 +243,13 @@ extension FeedDetailViewController: FeedDetailInteraction {
let indexPath = IndexPath(row: story.index, section: 0)
suppressMarkAsRead = true
didSelectItem(at: indexPath)
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
self.suppressMarkAsRead = false
}
}
func reading(story: Story) {
@ -249,6 +257,10 @@ extension FeedDetailViewController: FeedDetailInteraction {
}
func read(story: Story) {
if suppressMarkAsRead {
return
}
let dict = story.dictionary
if isSwiftUI, storiesCollection.isStoryUnread(dict) {

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

@ -1553,7 +1553,7 @@
NSInteger position = floor(self->scrollPct * strongSelf.webView.scrollView.contentSize.height);
NSInteger maxPosition = (NSInteger)(floor(strongSelf.webView.scrollView.contentSize.height - strongSelf.webView.frame.size.height));
if (position > maxPosition) {
NSLog(@"Position too far, scaling back to max position: %ld > %ld", (long)position, (long)maxPosition);
NSLog(@"Position too far, scaling back to max position: %@ > %@", @(position), @(maxPosition));
position = maxPosition;
}
if (position > 0) {