diff --git a/iOS/Article/ArticleExtractorButton.swift b/iOS/Article/ArticleExtractorButton.swift
index 8c4641964..20eab116f 100644
--- a/iOS/Article/ArticleExtractorButton.swift
+++ b/iOS/Article/ArticleExtractorButton.swift
@@ -17,6 +17,15 @@ enum ArticleExtractorButtonState {
class ArticleExtractorButton: UIButton {
+ init() {
+ super.init(frame: .zero)
+ setImage(AppAssets.articleExtractorOff, for: .normal)
+ }
+
+ required init?(coder: NSCoder) {
+ super.init(coder: coder)
+ }
+
var buttonState: ArticleExtractorButtonState = .off {
didSet {
if buttonState != oldValue {
diff --git a/iOS/Article/ArticleViewController.swift b/iOS/Article/ArticleViewController.swift
index 5684e0572..6bf0b5934 100644
--- a/iOS/Article/ArticleViewController.swift
+++ b/iOS/Article/ArticleViewController.swift
@@ -22,7 +22,6 @@ enum ArticleViewState: Equatable {
class ArticleViewController: UIViewController {
- @IBOutlet private weak var articleExtractorButton: ArticleExtractorButton!
@IBOutlet private weak var nextUnreadBarButtonItem: UIBarButtonItem!
@IBOutlet private weak var prevArticleBarButtonItem: UIBarButtonItem!
@IBOutlet private weak var nextArticleBarButtonItem: UIBarButtonItem!
@@ -31,6 +30,8 @@ class ArticleViewController: UIViewController {
@IBOutlet private weak var actionBarButtonItem: UIBarButtonItem!
@IBOutlet private weak var browserBarButtonItem: UIBarButtonItem!
@IBOutlet private weak var webViewContainer: UIView!
+
+ private var articleExtractorButton = ArticleExtractorButton()
private var webView: WKWebView!
weak var coordinator: SceneCoordinator!
@@ -83,9 +84,9 @@ class ArticleViewController: UIViewController {
NotificationCenter.default.addObserver(self, selector: #selector(progressDidChange(_:)), name: .AccountRefreshProgressDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(contentSizeCategoryDidChange(_:)), name: UIContentSizeCategory.didChangeNotification, object: nil)
- // For some reason interface builder won't let me set this there.
articleExtractorButton.addTarget(self, action: #selector(toggleArticleExtractor(_:)), for: .touchUpInside)
-
+ navigationItem.titleView = articleExtractorButton
+
ArticleViewControllerWebViewProvider.shared.dequeueWebView() { webView in
self.webView = webView
diff --git a/iOS/Base.lproj/Main.storyboard b/iOS/Base.lproj/Main.storyboard
index e6539a17d..5aa9eebcd 100644
--- a/iOS/Base.lproj/Main.storyboard
+++ b/iOS/Base.lproj/Main.storyboard
@@ -30,16 +30,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -58,6 +48,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -77,14 +77,6 @@
-
-
-
-
@@ -112,7 +104,6 @@
-
@@ -237,7 +228,6 @@
-