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 @@ - - - - - - - - - - - + @@ -291,7 +281,6 @@ - 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")