Merge branch 'ios-release'

iOS/Article/ArticleViewController.swift

@@ -92,8 +92,15 @@ class ArticleViewController: UIViewController {
 		pageViewController = UIPageViewController(transitionStyle: .scroll, navigationOrientation: .horizontal, options: [:])
 		pageViewController.delegate = self
 		pageViewController.dataSource = self
+
+		// This code is to disallow paging if we scroll from the left edge.  If this code is removed
+		// PoppableGestureRecognizerDelegate will allow us to both navigate back and page back at the
+		// same time. That is really weird when it happens.
+		let panGestureRecognizer = UIPanGestureRecognizer()
+		panGestureRecognizer.delegate = self
+		pageViewController.scrollViewInsidePageControl?.addGestureRecognizer(panGestureRecognizer)
+
 		pageViewController.view.translatesAutoresizingMaskIntoConstraints = false
-		
 		view.addSubview(pageViewController.view)
 		addChild(pageViewController!)
 		NSLayoutConstraint.activate([
@@ -329,6 +336,24 @@ extension ArticleViewController: UIPageViewControllerDelegate {
 	
 }
 
+// MARK: UIGestureRecognizerDelegate
+
+extension ArticleViewController: UIGestureRecognizerDelegate {
+	
+    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+		let point = gestureRecognizer.location(in: nil)
+		if point.x > 40 {
+			return true
+		}
+		return false
+    }
+	
+}
+
 // MARK: Private
 
 private extension ArticleViewController {

iOS/UIKit Extensions/UIPageViewController-Extensions.swift

@@ -0,0 +1,22 @@
+//
+//  UIPageViewController-Extensions.swift
+//  NetNewsWire-iOS
+//
+//  Created by Maurice Parker on 4/12/20.
+//  Copyright © 2020 Ranchero Software. All rights reserved.
+//
+
+import UIKit
+
+extension UIPageViewController {
+	
+	var scrollViewInsidePageControl: UIScrollView? {
+		for view in view.subviews {
+			if let scrollView = view as? UIScrollView {
+				return scrollView
+			}
+		}
+		return nil
+	}
+	
+}