From 19f8f8bc97364accf404f0226b1c93252f2abe9d Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 29 Jun 2019 13:53:34 -0500
Subject: [PATCH] Fix missing settings button on iPhone

---
 iOS/AppAssets.swift                           |  4 ++++
 iOS/Base.lproj/Main.storyboard                | 13 +------------
 iOS/MasterFeed/MasterFeedViewController.swift |  5 +++++
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift
index a46414c06..352ece4b1 100644
--- a/iOS/AppAssets.swift
+++ b/iOS/AppAssets.swift
@@ -60,6 +60,10 @@ struct AppAssets {
 		return UIColor(named: "netNewsWireBlueColor")!
 	}()
 	
+	static var settingsImage: UIImage = {
+		return UIImage(named: "settingsImage")!
+	}()
+	
 	static var smartFeedColor: UIColor = {
 		return UIColor(named: "smartFeedColor")!
 	}()
diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index 5d9862a04..b09a0a793 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -243,17 +243,7 @@
                             </connections>
                         </barButtonItem>
                     </toolbarItems>
-                    <navigationItem key="navigationItem" title="Feeds" id="Zdf-7t-Un8">
-                        <barButtonItem key="leftBarButtonItem" title="Settings" image="settingsImage" id="2lM-3y-hKs">
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="boolean" keyPath="accEnabled" value="YES"/>
-                                <userDefinedRuntimeAttribute type="string" keyPath="accLabelText" value="Settings"/>
-                            </userDefinedRuntimeAttributes>
-                            <connections>
-                                <action selector="settings:" destination="7bK-jq-Zjz" id="keC-la-uyI"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
+                    <navigationItem key="navigationItem" title="Feeds" id="Zdf-7t-Un8"/>
                     <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
                     <connections>
                         <outlet property="addNewItemButton" destination="yo6-w4-SfI" id="NbL-RH-N4J"/>
@@ -291,7 +281,6 @@
         <image name="arrow.up" catalog="system" width="58" height="64"/>
         <image name="circle" catalog="system" width="64" height="62"/>
         <image name="safari" catalog="system" width="64" height="62"/>
-        <image name="settingsImage" width="24" height="24"/>
         <image name="square.and.arrow.up" catalog="system" width="56" height="64"/>
         <image name="star" catalog="system" width="64" height="58"/>
     </resources>
diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift
index 6dabe827c..f07b89780 100644
--- a/iOS/MasterFeed/MasterFeedViewController.swift
+++ b/iOS/MasterFeed/MasterFeedViewController.swift
@@ -29,6 +29,11 @@ class MasterFeedViewController: ProgressTableViewController, UndoableCommandRunn
 
 		super.viewDidLoad()
 
+		let settingsButton = UIBarButtonItem()
+		settingsButton.image = AppAssets.settingsImage
+		settingsButton.action = #selector(settings(_:))
+		navigationItem.leftBarButtonItem = settingsButton
+		
 		navigationItem.rightBarButtonItem = editButtonItem
 		
 		tableView.register(MasterFeedTableViewSectionHeader.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")