Add custom titles for Recent

Author: kean

WordPress/Classes/Utility/SharedStrings.swift

@@ -27,5 +27,7 @@ enum SharedStrings {
 
     enum Reader {
         static let unfollow = NSLocalizedString("reader.button.unfollow", value: "Unfollow", comment: "Reader sidebar button title")
+        static let recent = NSLocalizedString("reader.recent.title", value: "Recent", comment: "Used in multiple contexts, usually as a screen title")
+        static let discover = NSLocalizedString("reader.discover.title", value: "Discover", comment: "Used in multiple contexts, usually as a screen title")
     }
 }

WordPress/Classes/ViewRelated/Reader/ReaderDiscoverHeaderView.swift

@@ -27,7 +27,7 @@ final class ReaderDiscoverHeaderView: UIView, UITextViewDelegate {
         addSubview(stackView)
         stackView.pinEdges(insets: ReaderStreamTitleView.preferredInsets)
 
-        titleView.titleLabel.text = Strings.title
+        titleView.titleLabel.text = SharedStrings.Reader.discover
         titleView.detailsTextView.attributedText = {
             guard let details = try? NSMutableAttributedString(markdown: Strings.details) else {
                 return nil
@@ -204,7 +204,6 @@ enum ReaderDiscoverChannel: Hashable {
 }
 
 private enum Strings {
-    static let title = NSLocalizedString("reader.discover.header.title", value: "Discover", comment: "Header view title")
     static let details = NSLocalizedString("reader.discover.header.title", value: "Explore popular blogs that inspire, educate, and entertain based on your [interests](/interests).", comment: "Reader Discover header view details label. The text has a Markdown URL: [interests](/interests). Only the text in the square brackets needs to be translated: [<translate_this>](/interests).")
     static let editInterests = NSLocalizedString("reader.editInterests.title", value: "Edit Interests", comment: "Screen title")
 }

WordPress/Classes/ViewRelated/Reader/ReaderStreamTitleView.swift

@@ -22,18 +22,16 @@ final class ReaderStreamTitleView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
 
-    static let preferredInsets = UIEdgeInsets(top: 16, left: 16, bottom: 8, right: 16)
+    static let preferredInsets = UIEdgeInsets(top: 4, left: 16, bottom: 8, right: 16)
 }
 
 extension ReaderStreamTitleView {
     static func makeForFollowing() -> ReaderStreamTitleView {
         let view = ReaderStreamTitleView()
-        view.titleLabel.text = Strings.followingTitle
+        view.titleLabel.text = SharedStrings.Reader.recent
         view.detailsTextView.text = Strings.followingDetails
         return view
     }
-
-    static var followingTitle: String { Strings.followingTitle }
 }
 
 final class ReaderNavigationCustomTitleView: UIView {
@@ -68,6 +66,5 @@ final class ReaderNavigationCustomTitleView: UIView {
 }
 
 private enum Strings {
-    static let followingTitle = NSLocalizedString("reader.following.header.title", value: "Following", comment: "Screen header title")
     static let followingDetails = NSLocalizedString("reader.following.header.details", value: "Stay current with the blogs you've subscribed to.", comment: "Screen header details")
 }

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift

@@ -641,11 +641,21 @@ import AutomatticTracks
         }
 
         if FeatureFlag.readerReset.enabled {
-            if ReaderHelpers.topicIsFollowing(topic) {
-                title = ReaderStreamTitleView.followingTitle
-                titleView.textLabel.text = ReaderStreamTitleView.followingTitle
-                navigationItem.titleView = titleView
-            }
+            configureCustomTitleView(for: topic)
+        }
+    }
+
+    private func configureCustomTitleView(for topic: ReaderAbstractTopic) {
+        var title: String?
+        if ReaderHelpers.topicIsFollowing(topic) {
+            title = SharedStrings.Reader.recent
+        } else if ReaderHelpers.topicIsDiscover(topic) {
+            title = SharedStrings.Reader.discover
+        }
+        if let title {
+            self.title = title
+            titleView.textLabel.text = title
+            navigationItem.titleView = titleView
         }
     }