FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ios-candidate' of https://github.com/Ranchero-Software/NetNewsWire into ios-candidate

This commit is contained in:
Brent Simmons 2020-01-19 14:19:15 -08:00
parent 6181f416a4 b1653845c2
commit 093c91d792
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iOS/Article/WebViewController.swift
View File

@ -180,9 +180,9 @@ class WebViewController: UIViewController {
} }
func fullReload() { func fullReload() {
if let offset = webView?.scrollView.contentOffset.y { webView?.evaluateJavaScript("window.scrollY") { (scrollY, _) in
restoreOffset = Int(offset) self.restoreOffset = scrollY as! Int
webView?.reload() self.reloadHTML()
} }
} }
@ -436,7 +436,9 @@ private extension WebViewController {
// play on the iPad where we aren't constantly pushing and popping this controller. // play on the iPad where we aren't constantly pushing and popping this controller.
if (renderingTracker > 10) { if (renderingTracker > 10) {
reloadHTML() reloadHTML()
return
} }
renderingTracker += 1 renderingTracker += 1
let style = ArticleStylesManager.shared.currentStyle let style = ArticleStylesManager.shared.currentStyle

4
iOS/MasterFeed/MasterFeedViewController.swift
View File

@ -1167,7 +1167,7 @@ private extension MasterFeedViewController {
feed.rename(to: name) { result in feed.rename(to: name) { result in
switch result { switch result {
case .success: case .success:
self?.reloadNode(node) break
case .failure(let error): case .failure(let error):
self?.presentError(error) self?.presentError(error)
} }
@ -1176,7 +1176,7 @@ private extension MasterFeedViewController {
folder.rename(to: name) { result in folder.rename(to: name) { result in
switch result { switch result {
case .success: case .success:
self?.reloadNode(node) break
case .failure(let error): case .failure(let error):
self?.presentError(error) self?.presentError(error)
} }

2
iOS/Resources/styleSheet.css
View File

@ -199,14 +199,12 @@ sub {
width: 100% !important; width: 100% !important;
} }
@media (max-width: 420px) {
blockquote { blockquote {
margin-inline-start: 0; margin-inline-start: 0;
margin-inline-end: 0; margin-inline-end: 0;
padding-left: 15px; padding-left: 15px;
border-left: 3px solid var(--secondary-accent-color); border-left: 3px solid var(--secondary-accent-color);
} }
}
/* Feed Specific */ /* Feed Specific */

1
iOS/UIKit Extensions/InteractiveNavigationController.swift
View File

@ -51,6 +51,7 @@ private extension InteractiveNavigationController {
navigationAppearance.titleTextAttributes = [.foregroundColor: UIColor.label] navigationAppearance.titleTextAttributes = [.foregroundColor: UIColor.label]
navigationAppearance.largeTitleTextAttributes = [.foregroundColor: UIColor.label] navigationAppearance.largeTitleTextAttributes = [.foregroundColor: UIColor.label]
navigationBar.standardAppearance = navigationAppearance navigationBar.standardAppearance = navigationAppearance
navigationBar.scrollEdgeAppearance = navigationAppearance
navigationBar.tintColor = AppAssets.primaryAccentColor navigationBar.tintColor = AppAssets.primaryAccentColor
let toolbarAppearance = UIToolbarAppearance() let toolbarAppearance = UIToolbarAppearance()