From b5525e1a9e44fdd9605441f029f55559d4833b81 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Sun, 24 Nov 2019 10:33:13 -0600 Subject: [PATCH] Restore back button items. Issue #1337 --- iOS/MasterFeed/MasterFeedViewController.swift | 3 --- iOS/MasterTimeline/MasterTimelineViewController.swift | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/iOS/MasterFeed/MasterFeedViewController.swift b/iOS/MasterFeed/MasterFeedViewController.swift index 113c746e3..5b64d2e38 100644 --- a/iOS/MasterFeed/MasterFeedViewController.swift +++ b/iOS/MasterFeed/MasterFeedViewController.swift @@ -39,9 +39,6 @@ class MasterFeedViewController: UITableViewController, UndoableCommandRunner { navigationController?.navigationBar.prefersLargeTitles = true } - // Set the bar button item so that it doesn't show on the timeline view - navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil) - // If you don't have an empty table header, UIKit tries to help out by putting one in for you // that makes a gap between the first section header and the navigation bar var frame = CGRect.zero diff --git a/iOS/MasterTimeline/MasterTimelineViewController.swift b/iOS/MasterTimeline/MasterTimelineViewController.swift index 0db8fc13c..32a4bb73c 100644 --- a/iOS/MasterTimeline/MasterTimelineViewController.swift +++ b/iOS/MasterTimeline/MasterTimelineViewController.swift @@ -72,8 +72,7 @@ class MasterTimelineViewController: UITableViewController, UndoableCommandRunner resetUI() applyChanges(animated: false) - // Set the bar button item so that it doesn't show on the article view - navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil) + title = coordinator.timelineFeed?.nameForDisplay ?? "Timeline" // Restore the scroll position if we have one stored if let restoreIndexPath = coordinator.timelineMiddleIndexPath {