From bd75df7294d0e3a5f96e81890391e2576c5609d7 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 24 Mar 2020 16:42:46 -0500
Subject: [PATCH 1/9] Add pointer interaction for timeline header button. 
 Issue #1943

---
 .../MasterTimelineTitleView.swift             | 39 +++++++++++++++++++
 .../MasterTimelineViewController.swift        |  5 +--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/iOS/MasterTimeline/MasterTimelineTitleView.swift b/iOS/MasterTimeline/MasterTimelineTitleView.swift
index 3046f079a..ee8eccb78 100644
--- a/iOS/MasterTimeline/MasterTimelineTitleView.swift
+++ b/iOS/MasterTimeline/MasterTimelineTitleView.swift
@@ -13,5 +13,44 @@ class MasterTimelineTitleView: UIView {
 	@IBOutlet weak var iconView: IconView!
 	@IBOutlet weak var label: UILabel!
 	@IBOutlet weak var unreadCountView: MasterTimelineUnreadCountView!
+
+	@available(iOS 13.4, *)
+	private lazy var pointerInteraction: UIPointerInteraction = {
+		UIPointerInteraction(delegate: self)
+	}()
+	
+	func buttonize() {
+		heightAnchor.constraint(equalToConstant: 40.0).isActive = true
+		accessibilityTraits = .button
+		if #available(iOS 13.4, *) {
+			addInteraction(pointerInteraction)
+		}
+	}
+	
+	func debuttonize() {
+		accessibilityTraits.remove(.button)
+		if #available(iOS 13.4, *) {
+			removeInteraction(pointerInteraction)
+		}
+	}
+	
+}
+
+extension MasterTimelineTitleView: UIPointerInteractionDelegate {
+	
+	@available(iOS 13.4, *)
+	func pointerInteraction(_ interaction: UIPointerInteraction, styleFor region: UIPointerRegion) -> UIPointerStyle? {
+		
+		let params = UIPreviewParameters()
+		var rect = self.bounds
+		rect.origin.x = rect.origin.x - 10
+		rect.size.width = rect.width + 20
+		let path = UIBezierPath(roundedRect: rect, cornerRadius: 10.0)
+		params.visiblePath = path
+		
+		let preview = UITargetedPreview(view: self, parameters: params)
+
+		return UIPointerStyle(effect: .automatic(preview), shape: .path(path))
+	}
 	
 }
diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift
index 4cb77da86..8f7b41c24 100644
--- a/iOS/MasterTimeline/MasterTimelineViewController.swift
+++ b/iOS/MasterTimeline/MasterTimelineViewController.swift
@@ -564,12 +564,11 @@ private extension MasterTimelineViewController {
 			updateTitleUnreadCount()
 
 			if coordinator.timelineFeed is WebFeed {
-				titleView.heightAnchor.constraint(equalToConstant: 44.0).isActive = true
+				titleView.buttonize()
 				titleView.addGestureRecognizer(feedTapGestureRecognizer)
-				titleView.accessibilityTraits = .button
 			} else {
+				titleView.debuttonize()
 				titleView.removeGestureRecognizer(feedTapGestureRecognizer)
-				titleView.accessibilityTraits.remove(.button)
 			}
 			
 			navigationItem.titleView = titleView

From 450ddbd364904bd44df7b1fe29637589d375c757 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 24 Mar 2020 18:27:54 -0500
Subject: [PATCH 2/9] Refactored new pointer interaction code to be more
 simple.

---
 iOS/MasterTimeline/MasterTimelineTitleView.swift | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/iOS/MasterTimeline/MasterTimelineTitleView.swift b/iOS/MasterTimeline/MasterTimelineTitleView.swift
index ee8eccb78..76e4fbbaa 100644
--- a/iOS/MasterTimeline/MasterTimelineTitleView.swift
+++ b/iOS/MasterTimeline/MasterTimelineTitleView.swift
@@ -40,17 +40,11 @@ extension MasterTimelineTitleView: UIPointerInteractionDelegate {
 	
 	@available(iOS 13.4, *)
 	func pointerInteraction(_ interaction: UIPointerInteraction, styleFor region: UIPointerRegion) -> UIPointerStyle? {
-		
-		let params = UIPreviewParameters()
-		var rect = self.bounds
+		var rect = self.frame
 		rect.origin.x = rect.origin.x - 10
 		rect.size.width = rect.width + 20
-		let path = UIBezierPath(roundedRect: rect, cornerRadius: 10.0)
-		params.visiblePath = path
-		
-		let preview = UITargetedPreview(view: self, parameters: params)
 
-		return UIPointerStyle(effect: .automatic(preview), shape: .path(path))
+		return UIPointerStyle(effect: .automatic(UITargetedPreview(view: self)), shape: .roundedRect(rect))
 	}
 	
 }

From 1d464718649284402c808b5ef4c107c469e02631 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 24 Mar 2020 18:40:36 -0500
Subject: [PATCH 3/9] Add step to list out available applications

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4c8984b2d..373d14d84 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,9 @@ jobs:
       with: 
         submodules: recursive
 
+    - name: List Available Applications
+      run: ls /Applications
+
     - name: Switch to Xcode 11
       run: sudo xcode-select -s /Applications/Xcode_11.app
 

From 6889d2a61a96311e10a38ce074869f21a564e873 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 24 Mar 2020 18:42:18 -0500
Subject: [PATCH 4/9] Switch to using XCode 11.4 to build

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 373d14d84..deba53731 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
       run: ls /Applications
 
     - name: Switch to Xcode 11
-      run: sudo xcode-select -s /Applications/Xcode_11.app
+      run: sudo xcode-select -s /Applications/Xcode_11.4.app
 
     - name: Show Build Version
       run: xcodebuild -version

From 3c0862fe832fd81510c6f3306010de34364942c0 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 24 Mar 2020 19:32:16 -0500
Subject: [PATCH 5/9] Update iOS destination for new SDK

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index deba53731..c0e58f182 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         run-config:
           - { scheme: 'NetNewsWire', destination: 'platform=macOS'}
-          - { scheme: 'NetNewsWire-iOS', destination: 'platform=iOS Simulator,OS=13.0,name=iPhone 11' }
+          - { scheme: 'NetNewsWire-iOS', destination: 'platform=iOS Simulator,OS=13.4,name=iPhone 11' }
     
     steps:
     - name: Checkout Project

From 6c06c7791cc40b7a69f3a3b231b258c0ee965a1d Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Wed, 25 Mar 2020 08:55:02 -0500
Subject: [PATCH 6/9] Add interaction to buttons that were missing it.  Issue
 #1945

---
 iOS/Account/Account.storyboard                | 12 ++---
 .../Cell/MasterFeedTableViewCell.swift        |  7 ++-
 .../MasterFeedTableViewSectionHeader.swift    | 34 +++++++++----
 iOS/MasterFeed/MasterFeedViewController.swift | 49 ++++++++++++-------
 4 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/iOS/Account/Account.storyboard b/iOS/Account/Account.storyboard
index 52982af01..b68e2fc00 100644
--- a/iOS/Account/Account.storyboard
+++ b/iOS/Account/Account.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -57,7 +57,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="o06-fe-i3S">
-                                                    <rect key="frame" x="20" y="11.5" width="334" height="21"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -206,7 +206,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Name" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yl1-R6-xZi">
-                                                    <rect key="frame" x="20" y="11.5" width="334" height="21"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocapitalizationType="words"/>
                                                 </textField>
@@ -291,7 +291,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" adjustsFontForContentSizeCategory="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vJa-NN-yjR">
-                                                    <rect key="frame" x="20" y="11.5" width="334" height="21"/>
+                                                    <rect key="frame" x="20" y="11" width="334" height="22"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="emailAddress" textContentType="username"/>
                                                 </textField>
@@ -315,7 +315,7 @@
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
                                                 </textField>
-                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TfW-wf-V06">
+                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" pointerInteraction="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TfW-wf-V06">
                                                     <rect key="frame" x="311" y="5.5" width="43" height="33"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <state key="normal" title="Show"/>
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
index 1bed941f6..4e6e4513e 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
+++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
@@ -12,7 +12,7 @@ import Account
 import RSTree
 
 protocol MasterFeedTableViewCellDelegate: class {
-	func disclosureSelected(_ sender: MasterFeedTableViewCell, expanding: Bool)
+	func masterFeedTableViewCellDisclosureDidToggle(_ sender: MasterFeedTableViewCell, expanding: Bool)
 }
 
 class MasterFeedTableViewCell : VibrantTableViewCell {
@@ -149,7 +149,7 @@ class MasterFeedTableViewCell : VibrantTableViewCell {
 	@objc func buttonPressed(_ sender: UIButton) {
 		if isDisclosureAvailable {
 			setDisclosure(isExpanded: !isDisclosureExpanded, animated: true)
-			delegate?.disclosureSelected(self, expanding: isDisclosureExpanded)
+			delegate?.masterFeedTableViewCellDisclosureDidToggle(self, expanding: isDisclosureExpanded)
 		}
 	}
 	
@@ -181,6 +181,9 @@ private extension MasterFeedTableViewCell {
 		disclosureButton?.tintColor = AppAssets.controlBackgroundColor
 		disclosureButton?.imageView?.contentMode = .center
 		disclosureButton?.imageView?.clipsToBounds = false
+		if #available(iOS 13.4, *) {
+			disclosureButton?.isPointerInteractionEnabled = true
+		}
 		addSubviewAtInit(disclosureButton!)
 	}
 	
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
index 0227184bf..56082ab3c 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
+++ b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
@@ -8,8 +8,14 @@
 
 import UIKit
 
+protocol MasterFeedTableViewSectionHeaderDelegate {
+	func masterFeedTableViewSectionHeaderDisclosureDidToggle(_ sender: MasterFeedTableViewSectionHeader)
+}
+
 class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 	
+	var delegate: MasterFeedTableViewSectionHeaderDelegate?
+	
 	override var accessibilityLabel: String? {
 		set {}
 		get {
@@ -66,12 +72,16 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 	}()
 	
 	private let unreadCountView = MasterFeedUnreadCountView(frame: CGRect.zero)
-	private var disclosureView: UIImageView = {
-		let iView = NonIntrinsicImageView()
-		iView.tintColor = UIColor.tertiaryLabel
-		iView.image = AppAssets.disclosureImage
-		iView.contentMode = .center
-		return iView
+	private lazy var disclosureButton: UIButton = {
+		let button = NonIntrinsicButton()
+		button.tintColor = UIColor.tertiaryLabel
+		button.setImage(AppAssets.disclosureImage, for: .normal)
+		button.contentMode = .center
+		if #available(iOS 13.4, *) {
+			button.isPointerInteractionEnabled = true
+		}
+		button.addTarget(self, action: #selector(toggleDisclosure), for: .touchUpInside)
+		return button
 	}()
 
 	private let topSeparatorView: UIView = {
@@ -115,10 +125,14 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 
 private extension MasterFeedTableViewSectionHeader {
 	
+	@objc func toggleDisclosure() {
+		delegate?.masterFeedTableViewSectionHeaderDisclosureDidToggle(self)
+	}
+	
 	func commonInit() {
 		addSubviewAtInit(unreadCountView)
 		addSubviewAtInit(titleView)
-		addSubviewAtInit(disclosureView)
+		addSubviewAtInit(disclosureButton)
 		updateExpandedState(animate: false)
 		addBackgroundView()
 		addSubviewAtInit(topSeparatorView)
@@ -136,9 +150,9 @@ private extension MasterFeedTableViewSectionHeader {
 			withDuration: duration,
 			animations: {
 				if self.disclosureExpanded {
-					self.disclosureView.transform = CGAffineTransform(rotationAngle: 1.570796)
+					self.disclosureButton.transform = CGAffineTransform(rotationAngle: 1.570796)
 				} else {
-					self.disclosureView.transform = CGAffineTransform(rotationAngle: 0)
+					self.disclosureButton.transform = CGAffineTransform(rotationAngle: 0)
 				}
 			}, completion: { _ in
 				if !self.isLastSection && !self.disclosureExpanded {
@@ -167,7 +181,7 @@ private extension MasterFeedTableViewSectionHeader {
 	func layoutWith(_ layout: MasterFeedTableViewSectionHeaderLayout) {
 		titleView.setFrameIfNotEqual(layout.titleRect)
 		unreadCountView.setFrameIfNotEqual(layout.unreadCountRect)
-		disclosureView.setFrameIfNotEqual(layout.disclosureButtonRect)
+		disclosureButton.setFrameIfNotEqual(layout.disclosureButtonRect)
 		
 		let top = CGRect(x: safeAreaInsets.left, y: 0, width: frame.width - safeAreaInsets.right - safeAreaInsets.left, height: 0.33)
 		topSeparatorView.setFrameIfNotEqual(top)
diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift
index 5432c72a0..d8f99402f 100644
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/MasterFeed/MasterFeedViewController.swift
@@ -158,6 +158,7 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 		}
 		
 		let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! MasterFeedTableViewSectionHeader
+		headerView.delegate = self
 		headerView.name = nameProvider.nameForDisplay
 		
 		guard let sectionNode = coordinator.rootNode.childAtIndex(section) else {
@@ -386,24 +387,10 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner {
 	}
 	
 	@objc func toggleSectionHeader(_ sender: UITapGestureRecognizer) {
-		
-		guard let sectionIndex = sender.view?.tag,
-			let sectionNode = coordinator.rootNode.childAtIndex(sectionIndex),
-			let headerView = sender.view as? MasterFeedTableViewSectionHeader
-				else {
-					return
+		guard let headerView = sender.view as? MasterFeedTableViewSectionHeader else {
+			return
 		}
-		
-		if coordinator.isExpanded(sectionNode) {
-			headerView.disclosureExpanded = false
-			coordinator.collapse(sectionNode)
-			self.applyChanges(animated: true)
-		} else {
-			headerView.disclosureExpanded = true
-			coordinator.expand(sectionNode)
-			self.applyChanges(animated: true)
-		}
-		
+		toggle(headerView)
 	}
 	
 	@objc func refreshAccounts(_ sender: Any) {
@@ -556,11 +543,21 @@ extension MasterFeedViewController: UIContextMenuInteractionDelegate {
 	}
 }
 
+// MARK: MasterFeedTableViewSectionHeaderDelegate
+
+extension MasterFeedViewController: MasterFeedTableViewSectionHeaderDelegate {
+	
+	func masterFeedTableViewSectionHeaderDisclosureDidToggle(_ sender: MasterFeedTableViewSectionHeader) {
+		toggle(sender)
+	}
+	
+}
+
 // MARK: MasterTableViewCellDelegate
 
 extension MasterFeedViewController: MasterFeedTableViewCellDelegate {
 	
-	func disclosureSelected(_ sender: MasterFeedTableViewCell, expanding: Bool) {
+	func masterFeedTableViewCellDisclosureDidToggle(_ sender: MasterFeedTableViewCell, expanding: Bool) {
 		if expanding {
 			expand(sender)
 		} else {
@@ -753,6 +750,22 @@ private extension MasterFeedViewController {
 		return nil
 	}
 
+	func toggle(_ headerView: MasterFeedTableViewSectionHeader) {
+		guard let sectionNode = coordinator.rootNode.childAtIndex(headerView.tag) else {
+			return
+		}
+		
+		if coordinator.isExpanded(sectionNode) {
+			headerView.disclosureExpanded = false
+			coordinator.collapse(sectionNode)
+			self.applyChanges(animated: true)
+		} else {
+			headerView.disclosureExpanded = true
+			coordinator.expand(sectionNode)
+			self.applyChanges(animated: true)
+		}
+	}
+
 	func expand(_ cell: MasterFeedTableViewCell) {
 		guard let indexPath = tableView.indexPath(for: cell), let node = dataSource.itemIdentifier(for: indexPath) else {
 			return

From a13f10441f21f1c81e14df22f8fd20ecdf43c709 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 26 Mar 2020 11:20:13 -0500
Subject: [PATCH 7/9] Change pointer interaction to encompass the complete
 button.

---
 iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift          | 2 +-
 iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
index 4e6e4513e..bf9d4652b 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
+++ b/iOS/MasterFeed/Cell/MasterFeedTableViewCell.swift
@@ -182,7 +182,7 @@ private extension MasterFeedTableViewCell {
 		disclosureButton?.imageView?.contentMode = .center
 		disclosureButton?.imageView?.clipsToBounds = false
 		if #available(iOS 13.4, *) {
-			disclosureButton?.isPointerInteractionEnabled = true
+			disclosureButton?.addInteraction(UIPointerInteraction())
 		}
 		addSubviewAtInit(disclosureButton!)
 	}
diff --git a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
index 56082ab3c..9c081688c 100644
--- a/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
+++ b/iOS/MasterFeed/Cell/MasterFeedTableViewSectionHeader.swift
@@ -78,7 +78,7 @@ class MasterFeedTableViewSectionHeader: UITableViewHeaderFooterView {
 		button.setImage(AppAssets.disclosureImage, for: .normal)
 		button.contentMode = .center
 		if #available(iOS 13.4, *) {
-			button.isPointerInteractionEnabled = true
+			button.addInteraction(UIPointerInteraction())
 		}
 		button.addTarget(self, action: #selector(toggleDisclosure), for: .touchUpInside)
 		return button

From bd1c73c1d3236e5975b603bbdd259bc7f3b68ac6 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Fri, 27 Mar 2020 18:24:57 -0500
Subject: [PATCH 8/9] Automatically remove Feed items if they should be
 filtered.  Issue #1949

---
 iOS/SceneCoordinator.swift | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift
index 4c3c0b108..470822377 100644
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -61,7 +61,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 	private var wasRootSplitViewControllerCollapsed = false
 	
 	private let fetchAndMergeArticlesQueue = CoalescingQueue(name: "Fetch and Merge Articles", interval: 0.5)
-	private let rebuildBackingStoresWithMergeQueue = CoalescingQueue(name: "Rebuild The Backing Stores by Merging", interval: 1.0)
+	private let rebuildBackingStoresQueue = CoalescingQueue(name: "Rebuild The Backing Stores", interval: 1.0)
 	private var fetchSerialNumber = 0
 	private let fetchRequestQueue = FetchRequestQueue()
 	
@@ -441,12 +441,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 			return	
 		}
 		
-		// If we are filtering reads, the new unread count is greater than 1, and the feed isn't shown then continue
-		guard let feed = note.object as? Feed, isReadFeedsFiltered, feed.unreadCount > 0, !shadowTableContains(feed) else {
-			return
-		}
-
-		rebuildBackingStoresWithMergeQueue.add(self, #selector(rebuildBackingStoresWithMerge))
+		rebuildBackingStoresQueue.add(self, #selector(rebuildBackingStoresWithDefaults))
 	}
 
 	@objc func statusesDidChange(_ note: Notification) {
@@ -465,7 +460,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 	}
 	
 	@objc func batchUpdateDidPerform(_ notification: Notification) {
-		rebuildBackingStoresWithMerge()
+		rebuildBackingStores()
 	}
 	
 	@objc func displayNameDidChange(_ note: Notification) {
@@ -541,7 +536,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 	}
 	
 	@objc func downloadArticlesDidUpdateUnreadCounts(_ note: Notification) {
-		rebuildBackingStoresWithMerge()
+		rebuildBackingStores()
 	}
 	
 	@objc func accountDidDownloadArticles(_ note: Notification) {
@@ -568,7 +563,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 	
 	func suspend() {
 		fetchAndMergeArticlesQueue.performCallsImmediately()
-		rebuildBackingStoresWithMergeQueue.performCallsImmediately()
+		rebuildBackingStoresQueue.performCallsImmediately()
 		fetchRequestQueue.cancelAllRequests()
 	}
 	
@@ -1361,6 +1356,10 @@ private extension SceneCoordinator {
 		}
 	}
 
+	@objc func rebuildBackingStoresWithDefaults() {
+		rebuildBackingStores()
+	}
+	
 	func rebuildBackingStores(initialLoad: Bool = false, updateExpandedNodes: (() -> Void)? = nil, completion: (() -> Void)? = nil) {
 		if !animatingChanges && !BatchUpdate.shared.isPerforming {
 			
@@ -1375,11 +1374,6 @@ private extension SceneCoordinator {
 		}
 	}
 	
-	@objc func rebuildBackingStoresWithMerge() {
-		addShadowTableToFilterExceptions()
-		rebuildBackingStores()
-	}
-	
 	func rebuildShadowTable() {
 		shadowTable = [[Node]]()
 

From 715671edad84cef71a65e2f2ce67c0a615935a9e Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 28 Mar 2020 01:43:54 -0500
Subject: [PATCH 9/9] Rebuild the Feeds list when coming back to it from the
 Timeline while the root split is collapsed to filter read Feeds.

---
 iOS/SceneCoordinator.swift | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/iOS/SceneCoordinator.swift b/iOS/SceneCoordinator.swift
index 470822377..0929f16c4 100644
--- a/iOS/SceneCoordinator.swift
+++ b/iOS/SceneCoordinator.swift
@@ -441,7 +441,7 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 			return	
 		}
 		
-		rebuildBackingStoresQueue.add(self, #selector(rebuildBackingStoresWithDefaults))
+		queueRebuildBackingStores()
 	}
 
 	@objc func statusesDidChange(_ note: Notification) {
@@ -740,6 +740,9 @@ class SceneCoordinator: NSObject, UndoableCommandRunner, UnreadCountProvider {
 		} else {
 			
 			setTimelineFeed(nil, animated: false) {
+				if self.isReadFeedsFiltered {
+					self.queueRebuildBackingStores()
+				}
 				self.activityManager.invalidateSelecting()
 				if self.rootSplitViewController.isCollapsed && self.navControllerForTimeline().viewControllers.last is MasterTimelineViewController {
 					self.navControllerForTimeline().popViewController(animated: animations.contains(.navigation))
@@ -1355,6 +1358,10 @@ private extension SceneCoordinator {
 			}
 		}
 	}
+	
+	func queueRebuildBackingStores() {
+		rebuildBackingStoresQueue.add(self, #selector(rebuildBackingStoresWithDefaults))
+	}
 
 	@objc func rebuildBackingStoresWithDefaults() {
 		rebuildBackingStores()