From 486cec80d061d171f41f631feccdc53d8e574053 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Thu, 26 Sep 2019 15:51:16 -0500
Subject: [PATCH] Move next/prev article buttons to top right and change to use
 chevrons instead of arrows.  Issue #1070

---
 iOS/AppDelegate.swift          |  2 +-
 iOS/Base.lproj/Main.storyboard | 67 +++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift
index 24561755b..b75d7b34c 100644
--- a/iOS/AppDelegate.swift
+++ b/iOS/AppDelegate.swift
@@ -219,7 +219,7 @@ private extension AppDelegate {
 	
 	private func initializeHomeScreenQuickActions() {
 		let unreadTitle = NSLocalizedString("First Unread", comment: "First Unread")
-		let unreadIcon = UIApplicationShortcutIcon(systemImageName: "arrow.down.circle")
+		let unreadIcon = UIApplicationShortcutIcon(systemImageName: "chevron.down.circle")
 		let unreadItem = UIApplicationShortcutItem(type: "com.ranchero.NetNewsWire.FirstUnread", localizedTitle: unreadTitle, localizedSubtitle: nil, icon: unreadIcon, userInfo: nil)
 		
 		let searchTitle = NSLocalizedString("Search", comment: "Search")
diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index 17f5e4a52..e6539a17d 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" 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="15400" 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="14824"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -30,7 +30,7 @@
                         <viewLayoutGuide key="safeArea" id="VUw-jc-0yf"/>
                     </view>
                     <toolbarItems>
-                        <barButtonItem enabled="NO" title="Next Unread" image="arrow.down.circle" catalog="system" id="2w5-e9-C2V">
+                        <barButtonItem enabled="NO" title="Next Unread" image="chevron.down.circle" catalog="system" id="2w5-e9-C2V">
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
                                 <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Next Unread"/>
@@ -40,26 +40,6 @@
                             </connections>
                         </barButtonItem>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="vAq-iW-Yyo"/>
-                        <barButtonItem title="Previous Article" image="arrow.up" catalog="system" style="plain" id="v4j-fq-23N">
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
-                                <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Previous Article"/>
-                            </userDefinedRuntimeAttributes>
-                            <connections>
-                                <action selector="prevArticle:" destination="JEX-9P-axG" id="cMZ-tk-I4W"/>
-                            </connections>
-                        </barButtonItem>
-                        <barButtonItem style="plain" systemItem="flexibleSpace" id="G92-nw-kXs"/>
-                        <barButtonItem title="Next Article" image="arrow.down" catalog="system" id="2qz-M5-Yhk">
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
-                                <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Next Article"/>
-                            </userDefinedRuntimeAttributes>
-                            <connections>
-                                <action selector="nextArticle:" destination="JEX-9P-axG" id="P77-KM-j8D"/>
-                            </connections>
-                        </barButtonItem>
-                        <barButtonItem style="plain" systemItem="flexibleSpace" id="Myj-ux-Zc5"/>
                         <barButtonItem title="Toggle Read" image="circle" catalog="system" id="hy0-LS-MzE">
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Toggle Read"/>
@@ -97,15 +77,36 @@
                                 <action selector="openBrowser:" destination="JEX-9P-axG" id="R0r-fI-NI7"/>
                             </connections>
                         </barButtonItem>
-                    </toolbarItems>
-                    <navigationItem key="navigationItem" largeTitleDisplayMode="never" id="mOI-FS-AaM">
-                        <barButtonItem key="rightBarButtonItem" style="plain" id="n8q-YO-ldL">
+                        <barButtonItem style="plain" systemItem="flexibleSpace" id="y6Z-dk-3Zw"/>
+                        <barButtonItem style="plain" id="n8q-YO-ldL">
                             <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="n73-9B-rav" customClass="ArticleExtractorButton" customModule="NetNewsWire" customModuleProvider="target">
-                                <rect key="frame" x="362" y="5" width="32" height="32"/>
+                                <rect key="frame" x="358" y="5" width="36" height="44"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" image="articleExtractorOff"/>
                             </button>
                         </barButtonItem>
+                    </toolbarItems>
+                    <navigationItem key="navigationItem" largeTitleDisplayMode="never" id="mOI-FS-AaM">
+                        <rightBarButtonItems>
+                            <barButtonItem title="Next Article" image="chevron.down" catalog="system" id="2qz-M5-Yhk">
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Next Article"/>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="nextArticle:" destination="JEX-9P-axG" id="P77-KM-j8D"/>
+                                </connections>
+                            </barButtonItem>
+                            <barButtonItem title="Previous Article" image="chevron.up" catalog="system" style="plain" id="v4j-fq-23N">
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Previous Article"/>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="prevArticle:" destination="JEX-9P-axG" id="cMZ-tk-I4W"/>
+                                </connections>
+                            </barButtonItem>
+                        </rightBarButtonItems>
                     </navigationItem>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
@@ -236,13 +237,13 @@
         </scene>
     </scenes>
     <resources>
-        <image name="arrow.down" catalog="system" width="58" height="64"/>
-        <image name="arrow.down.circle" catalog="system" width="64" height="62"/>
-        <image name="arrow.up" catalog="system" width="58" height="64"/>
         <image name="articleExtractorOff" width="18" height="23"/>
-        <image name="circle" catalog="system" width="64" height="62"/>
-        <image name="gear" catalog="system" width="64" height="60"/>
-        <image name="safari" catalog="system" width="64" height="62"/>
+        <image name="chevron.down" catalog="system" width="64" height="36"/>
+        <image name="chevron.down.circle" catalog="system" width="64" height="60"/>
+        <image name="chevron.up" catalog="system" width="64" height="36"/>
+        <image name="circle" catalog="system" width="64" height="60"/>
+        <image name="gear" catalog="system" width="64" height="58"/>
+        <image name="safari" catalog="system" width="64" height="60"/>
         <image name="square.and.arrow.up" catalog="system" width="56" height="64"/>
         <image name="star" catalog="system" width="64" height="58"/>
     </resources>