From 8dda681409e5629e8e41d83fdf3c10db1e37e873 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Tue, 10 Sep 2019 11:09:17 -0500
Subject: [PATCH 1/5] Add accessibility labels to Sidebar, Timeline, and
 Article.  Issue #934

---
 Mac/Base.lproj/MainWindow.storyboard            | 16 +++++++++-------
 Mac/MainWindow/Detail/DetailWebView.swift       |  4 ++++
 Mac/MainWindow/Timeline/TimelineTableView.swift |  4 ++++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Mac/Base.lproj/MainWindow.storyboard b/Mac/Base.lproj/MainWindow.storyboard
index 7d5f2c5dc..0a9cf634e 100644
--- a/Mac/Base.lproj/MainWindow.storyboard
+++ b/Mac/Base.lproj/MainWindow.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14865.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -268,14 +269,14 @@
                                     <subviews>
                                         <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="26" viewBased="YES" floatsGroupRows="NO" indentationPerLevel="23" outlineTableColumn="ih9-mJ-EA7" id="cnV-kg-Dn2" customClass="SidebarOutlineView" customModule="NetNewsWire" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="167" height="300"/>
-                                            <autoresizingMask key="autoresizingMask"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="0.0"/>
                                             <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
-                                                <tableColumn width="164" minWidth="16" maxWidth="1000" id="ih9-mJ-EA7">
+                                                <tableColumn width="164" minWidth="23" maxWidth="1000" id="ih9-mJ-EA7">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                        <font key="font" metaFont="smallSystem"/>
+                                                        <font key="font" metaFont="label" size="11"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
@@ -311,6 +312,7 @@
                                                     </prototypeCellViews>
                                                 </tableColumn>
                                             </tableColumns>
+                                            <accessibility description="Feeds"/>
                                             <connections>
                                                 <outlet property="delegate" destination="XML-A3-pDn" id="fPE-cv-p5c"/>
                                                 <outlet property="keyboardDelegate" destination="h5K-zR-cUa" id="BlT-aW-sea"/>
@@ -345,7 +347,7 @@
                                         </constraints>
                                     </progressIndicator>
                                     <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iyL-pW-cT6">
-                                        <rect key="frame" x="62" y="6" width="86" height="17"/>
+                                        <rect key="frame" x="62" y="6" width="86" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="dVE-XG-mlU">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -444,7 +446,7 @@
                                 <rect key="frame" x="6" y="2" width="12" height="20"/>
                                 <subviews>
                                     <textField horizontalHuggingPriority="850" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Dim-ed-Dcz" userLabel="URL Label">
-                                        <rect key="frame" x="4" y="2" width="4" height="17"/>
+                                        <rect key="frame" x="4" y="2" width="4" height="16"/>
                                         <textFieldCell key="cell" lineBreakMode="truncatingMiddle" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" usesSingleLineMode="YES" id="znU-Fh-L7H">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
diff --git a/Mac/MainWindow/Detail/DetailWebView.swift b/Mac/MainWindow/Detail/DetailWebView.swift
index 03c8109a6..e235b7d7b 100644
--- a/Mac/MainWindow/Detail/DetailWebView.swift
+++ b/Mac/MainWindow/Detail/DetailWebView.swift
@@ -14,6 +14,10 @@ final class DetailWebView: WKWebView {
 
 	weak var keyboardDelegate: KeyboardDelegate?
 	
+	override func accessibilityLabel() -> String? {
+		return NSLocalizedString("Article", comment: "Article")
+	}
+
 	// MARK: - NSResponder
 	
 	override func keyDown(with event: NSEvent) {
diff --git a/Mac/MainWindow/Timeline/TimelineTableView.swift b/Mac/MainWindow/Timeline/TimelineTableView.swift
index fb3639134..e70bbed17 100644
--- a/Mac/MainWindow/Timeline/TimelineTableView.swift
+++ b/Mac/MainWindow/Timeline/TimelineTableView.swift
@@ -13,6 +13,10 @@ class TimelineTableView: NSTableView {
 	
 	weak var keyboardDelegate: KeyboardDelegate?
 	
+	override func accessibilityLabel() -> String? {
+		return NSLocalizedString("Timeline", comment: "Timeline")
+	}
+	
 	// MARK: - NSResponder
 	
 	override func keyDown(with event: NSEvent) {

From 7ad0b6b604cdda6f9349fbc859763f472b7833cd Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 10 Sep 2019 20:28:16 -0700
Subject: [PATCH 2/5] Always update the unread count in the timeline after
 doing a sync fetch after representedObjects changes. Reload visible cells
 whenever showFeedNames changes. Fix #923.

---
 Mac/MainWindow/Timeline/TimelineViewController.swift | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Mac/MainWindow/Timeline/TimelineViewController.swift b/Mac/MainWindow/Timeline/TimelineViewController.swift
index 14b953e7a..4b770b8e6 100644
--- a/Mac/MainWindow/Timeline/TimelineViewController.swift
+++ b/Mac/MainWindow/Timeline/TimelineViewController.swift
@@ -48,6 +48,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 					if articles.count > 0 {
 						tableView.scrollRowToVisible(0)
 					}
+					updateUnreadCount()
 				}
 			}
 		}
@@ -106,6 +107,7 @@ final class TimelineViewController: NSViewController, UndoableCommandRunner, Unr
 			if showFeedNames != oldValue {
 				updateShowAvatars()
 				updateTableViewRowHeight()
+				reloadVisibleCells()
 			}
 		}
 	}
@@ -1009,10 +1011,7 @@ private extension TimelineViewController {
 	}
 
 	func replaceArticles(with unsortedArticles: Set<Article>) {
-		let sortedArticles = Array(unsortedArticles).sortedByDate(sortDirection)
-		if articles != sortedArticles {
-			articles = sortedArticles
-		}
+		articles = Array(unsortedArticles).sortedByDate(sortDirection)
 	}
 
 	func fetchUnsortedArticlesSync(for representedObjects: [Any]) -> Set<Article> {

From 1b7a46e505e9426a2f0bdfcae72d57a1aa785978 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 10 Sep 2019 20:32:15 -0700
Subject: [PATCH 3/5] Bump version to 5.0.1b1.

---
 xcconfig/NetNewsWire_target.xcconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xcconfig/NetNewsWire_target.xcconfig b/xcconfig/NetNewsWire_target.xcconfig
index 397010614..c3d4b1175 100644
--- a/xcconfig/NetNewsWire_target.xcconfig
+++ b/xcconfig/NetNewsWire_target.xcconfig
@@ -29,8 +29,8 @@ PROVISIONING_PROFILE_SPECIFIER =
 #include? "../../SharedXcodeSettings/DeveloperSettings.xcconfig"
 
 // High Level Settings common to both the Mac application and any extensions we bundle with it
-MARKETING_VERSION = 5.0.1d2
-CURRENT_PROJECT_VERSION = 2612
+MARKETING_VERSION = 5.0.1b1
+CURRENT_PROJECT_VERSION = 2613
 
 ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 COMBINE_HIDPI_IMAGES = YES

From b51000a1ffef8e72916d2cd458b71609837a466a Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 10 Sep 2019 20:58:02 -0700
Subject: [PATCH 4/5] Update appcast for 5.0.1b1.

---
 Appcasts/netnewswire-beta.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Appcasts/netnewswire-beta.xml b/Appcasts/netnewswire-beta.xml
index 7834e2a83..5b7d0dabf 100755
--- a/Appcasts/netnewswire-beta.xml
+++ b/Appcasts/netnewswire-beta.xml
@@ -6,6 +6,16 @@
         <description>Most recent NetNewsWire changes with links to updates.</description>
         <language>en</language>
 
+				<item>
+         <title>NetNewsWire 5.0.1b1</title>
+            <description><![CDATA[
+<p>Timeline: reload the timeline when show-feed-names is toggled. This fixes a bug where switching between a folder and a feed with the exact same list of articles to appear in the timeline would result in display glitches.</p>
+ 							]]></description>
+            <pubDate>Tue, 10 Sep 2019 20:50:00 -0700</pubDate>
+            <enclosure url="https://github.com/brentsimmons/NetNewsWire/releases/download/mac-5.0.1b1/NetNewsWire5.0.1b1zip" sparkle:version="2613" sparkle:shortVersionString="5.0.1b1" length="5094966" type="application/zip" />
+            <sparkle:minimumSystemVersion>10.14.4</sparkle:minimumSystemVersion>
+        </item>
+
 				<item>
          <title>NetNewsWire 5.0.1d2</title>
             <description><![CDATA[

From a0f2c1d90a6d6c721c2837257c0fbffdc8e343b7 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Tue, 10 Sep 2019 21:01:20 -0700
Subject: [PATCH 5/5] Fix URL in beta appcast.

---
 Appcasts/netnewswire-beta.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Appcasts/netnewswire-beta.xml b/Appcasts/netnewswire-beta.xml
index 5b7d0dabf..491fc8ecd 100755
--- a/Appcasts/netnewswire-beta.xml
+++ b/Appcasts/netnewswire-beta.xml
@@ -12,7 +12,7 @@
 <p>Timeline: reload the timeline when show-feed-names is toggled. This fixes a bug where switching between a folder and a feed with the exact same list of articles to appear in the timeline would result in display glitches.</p>
  							]]></description>
             <pubDate>Tue, 10 Sep 2019 20:50:00 -0700</pubDate>
-            <enclosure url="https://github.com/brentsimmons/NetNewsWire/releases/download/mac-5.0.1b1/NetNewsWire5.0.1b1zip" sparkle:version="2613" sparkle:shortVersionString="5.0.1b1" length="5094966" type="application/zip" />
+            <enclosure url="https://github.com/brentsimmons/NetNewsWire/releases/download/mac-5.0.1b1/NetNewsWire5.0.1b1.zip" sparkle:version="2613" sparkle:shortVersionString="5.0.1b1" length="5094966" type="application/zip" />
             <sparkle:minimumSystemVersion>10.14.4</sparkle:minimumSystemVersion>
         </item>