Integrate ReaderPostHeaderView

Author: kean

Modules/Sources/WordPressKitObjC/RemoteReaderPost.m

@@ -134,6 +134,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dict;
     self.sortDate = [self sortDateFromPostDictionary:dict];
     self.sortRank = @(self.sortDate.timeIntervalSinceReferenceDate);
     self.status = [self stringOrEmptyString:[dict stringForKey:PostRESTKeyStatus]];
+    self.excerpt = [self stringOrEmptyString:[dict stringForKey:PostRESTKeyExcerpt]];
     self.summary = [self postSummaryFromPostDictionary:dict orPostContent:self.content];
     self.tags = [self tagsFromPostDictionary:dict];
     self.isSharingEnabled = [[dict numberForKey:PostRESTKeySharingEnabled] boolValue];

Modules/Sources/WordPressKitObjC/include/RemoteReaderPost.h

@@ -38,6 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, nullable) NSNumber *siteID;
 @property (nonatomic, strong, nullable) NSDate *sortDate;
 @property (nonatomic, strong, nullable) NSNumber *sortRank;
+/// - warning: It may still contain auto-generated excerpts, but they are not automatically trimmed like `summary`.
+@property (nonatomic, strong, nullable) NSString *excerpt;
 @property (nonatomic, strong, nullable) NSString *summary;
 @property (nonatomic, strong, nullable) NSString *tags;
 @property (nonatomic) BOOL isLikesEnabled;

Modules/Sources/WordPressReader/Detail/ReaderPostHeaderView.swift

@@ -0,0 +1,39 @@
+import Foundation
+
+public enum ReaderReadTime {
+    /// Computes the estimated reading time in minutes from raw post content
+    /// (HTML or Markdown), accounting for words, images, and code blocks.
+    ///
+    /// - Parameters:
+    ///   - text: The raw post content (may contain HTML/Markdown).
+    ///   - wpm: Words per minute reading speed (default 238).
+    /// - Returns: Estimated reading time in minutes (minimum 1).
+    public static func compute(_ text: String, wpm: Double = 200) -> Int {
+        // 1. Strip HTML & Markdown
+        var clean = text
+        clean = clean.replacing(#/<[^>]+>/#, with: "")
+        clean = clean.replacing(#/!\[.*?\]\(.*?\)/#, with: "")
+        clean = clean.replacing(#/\[.*?\]\(.*?\)/#, with: " ")
+
+        // 2. Count words
+        let wordCount = clean.matches(of: #/\b\w+\b/#).count
+
+        // 3. Base reading time (seconds)
+        var totalSeconds = (Double(wordCount) / wpm) * 60
+
+        // 4. Image penalty (12s → 3s floor, decreasing per image)
+        let imageCount = text.matches(of: #/<img|!\[/#).count
+        for i in 0..<imageCount {
+            totalSeconds += Double(max(12 - i, 3))
+        }
+
+        // 5. Code block penalty (extra half-speed cost for code)
+        let codeMatches = text.matches(of: #/```[\s\S]*?```|`[^`]+`/#)
+        for match in codeMatches {
+            let codeWords = String(match.output).split(separator: " ").count
+            totalSeconds += (Double(codeWords) / wpm) * 60
+        }
+
+        return max(1, Int((totalSeconds / 60.0).rounded(.up)))
+    }
+}

Modules/Sources/WordPressReader/ReaderReadTime.swift

@@ -0,0 +1,61 @@
+import Testing
+@testable import WordPressReader
+
+struct ReaderReadTimeTests {
+
+    @Test func shortText() {
+        #expect(ReaderReadTime.compute("Hello world") == 1)
+    }
+
+    @Test func plainText200Words() {
+        // 200 words at 200 WPM = exactly 1 minute
+        let text = String(repeating: "word ", count: 200)
+        #expect(ReaderReadTime.compute(text) == 1)
+    }
+
+    @Test func plainText500Words() {
+        // 500 words / 200 WPM = 2.5 → rounds up to 3
+        let text = String(repeating: "word ", count: 500)
+        #expect(ReaderReadTime.compute(text) == 3)
+    }
+
+    @Test func plainText1000Words() {
+        // 1000 words / 200 WPM = 5 minutes
+        let text = String(repeating: "word ", count: 1000)
+        #expect(ReaderReadTime.compute(text) == 5)
+    }
+
+    @Test func htmlTagsAreStripped() {
+        let html = "<p>" + String(repeating: "word ", count: 500) + "</p>"
+        let plain = String(repeating: "word ", count: 500)
+        #expect(ReaderReadTime.compute(html) == ReaderReadTime.compute(plain))
+    }
+
+    @Test func imagesAddPenalty() {
+        // 200 words = 60s base. 3 images add 12 + 11 + 10 = 33s → 93s → 2 min
+        let base = String(repeating: "word ", count: 200)
+        let withImages = base + "<img src=\"a.png\"><img src=\"b.png\"><img src=\"c.png\">"
+        #expect(ReaderReadTime.compute(base) == 1)
+        #expect(ReaderReadTime.compute(withImages) == 2)
+    }
+
+    @Test func codeBlocksAddPenalty() {
+        let base = String(repeating: "word ", count: 200)
+        let withCode = base + "```let x = 1; let y = 2; let z = 3```"
+        #expect(ReaderReadTime.compute(withCode) >= ReaderReadTime.compute(base))
+    }
+
+    @Test func longPost() {
+        // ~2500 word blog post with HTML, images, and code
+        var post = "<h1>Getting Started with Swift Concurrency</h1>"
+        post += "<p>" + String(repeating: "This is a detailed explanation of the concept. ", count: 100) + "</p>"
+        post += "<img src=\"diagram1.png\">"
+        post += "<p>" + String(repeating: "Here we explore another important aspect of the topic. ", count: 100) + "</p>"
+        post += "<img src=\"diagram2.png\">"
+        post += "<pre><code>```func fetchData() async throws { let data = try await URLSession.shared.data(from: url)```</code></pre>"
+        post += "<p>" + String(repeating: "In conclusion this wraps up the discussion nicely. ", count: 50) + "</p>"
+        // ~2500 words / 200 WPM ≈ 12.5 min + image/code penalties → ~13 min
+        let result = ReaderReadTime.compute(post)
+        #expect(result == 12)
+    }
+}

Modules/Tests/WordPressReaderTests/ReaderReadTimeTests.swift

@@ -73,6 +73,7 @@ extension ReaderPost {
         permaLink = remotePost.permalink
         postID = remotePost.postID
         postTitle = remotePost.postTitle
+        mt_excerpt = remotePost.excerpt?.nonEmptyString()
         railcar = remotePost.railcar
         score = remotePost.score
         siteID = remotePost.siteID

Sources/WordPressData/Mapping/ReaderPost+Mapping.swift

@@ -1,5 +1,6 @@
 import Foundation
 import WordPressData
+import WordPressReader
 import WordPressUI
 import SwiftSoup
 
@@ -63,6 +64,49 @@ extension ReaderPost {
         try? lookup(withID: postID, forSiteWithID: siteID, in: context)
     }
 
+    /// Returns estimated reading time in minutes.
+    ///
+    /// Uses the API-provided `readingTime` when available, otherwise computes
+    /// it from the post content accounting for words, images, and code blocks.
+    func getEstimatedReadingTime() -> Int {
+        if let minutes = readingTime?.intValue, minutes > 0 {
+            return minutes
+        }
+        guard let content = contentForDisplay(), !content.isEmpty else {
+            return 0
+        }
+        return ReaderReadTime.compute(content)
+    }
+
+    /// Returns the excerpt only if it was explicitly provided by the post author.
+    ///
+    /// The API always returns a `excerpt`, but it's usually auto-generated by
+    /// truncating the post content. This method compares the summary against the
+    /// beginning of the content — if the summary is just a prefix of the content
+    /// (optionally ending with `[…]` or `…`), it's considered auto-generated
+    /// and `nil` is returned.
+    func getUserProvidedExcerpt() -> String? {
+        guard let excerpt = mt_excerpt?.makePlainText(), !excerpt.isEmpty else {
+            return nil
+        }
+        guard let content = contentForDisplay(), !content.isEmpty else {
+            return excerpt
+        }
+
+        // Auto-generated excerpts end with a truncation marker
+        if excerpt.hasSuffix("[…]") || excerpt.hasSuffix("…") {
+            return nil
+        }
+
+        // If the content starts with the excerpt, it's auto-generated
+        let plainContent = content.makePlainText()
+        if plainContent.hasPrefix(excerpt.prefix(50)) {
+            return nil
+        }
+
+        return excerpt
+    }
+
     func makeExceptHTML() -> String {
         """
         <html>

WordPress/Classes/Models/ReaderPost+Swift.swift

@@ -1,4 +1,7 @@
+import AsyncImageKit
 import Foundation
+import SafariServices
+import SwiftUI
 import WordPressData
 import WordPressReader
 import WordPressShared
@@ -691,28 +694,52 @@ class ReaderDetailCoordinator {
     }
 }
 
-// MARK: - ReaderDetailHeaderViewDelegate
-extension ReaderDetailCoordinator: ReaderDetailHeaderViewDelegate {
-    func didTapBlogName() {
-        previewSite()
-    }
-
-    func didTapTagButton() {
-        showTag()
-    }
-
-    func didTapHeaderAvatar() {
-        previewSite()
+// MARK: - ReaderPostHeaderViewDelegate
+extension ReaderDetailCoordinator: ReaderPostHeaderViewDelegate {
+    func readerPostHeaderView(_ view: ReaderPostHeaderView, didTap element: ReaderPostHeaderView.Element) {
+        switch element {
+        case .siteName:
+            previewSite()
+        case .subscribe:
+            view.isShowingSubscribeLoadingIndicator = true
+            followSite { [weak self] in
+                view.isShowingSubscribeLoadingIndicator = true
+                self?.view?.updateHeader()
+            }
+        case .author:
+            showAuthorProfile()
+        case .featuredImage:
+            showFeaturedImage(view.featuredImageView)
+        case .viewOriginal:
+            guard let post, let link = post.permaLink, let url = URL(string: link) else { return }
+            let safariVC = SFSafariViewController(url: url)
+            viewController?.present(safariVC, animated: true)
+        }
     }
 
-    func didTapFollowButton(completion: @escaping () -> Void) {
-        followSite(completion: completion)
+    private func showFeaturedImage(_ sender: AsyncImageView) {
+        guard let post, let imageURL = post.featuredImage.flatMap(URL.init) else {
+            return
+        }
+        let lightboxVC = LightboxViewController(sourceURL: imageURL, host: MediaHost(post))
+        MainActor.assumeIsolated {
+            lightboxVC.thumbnail = sender.image
+        }
+        lightboxVC.configureZoomTransition(sourceView: sender)
+        viewController?.present(lightboxVC, animated: true)
     }
 
-    func didSelectTopic(_ topic: String) {
-        showTopic(topic)
+    private func showAuthorProfile() {
+        guard let post else { return }
+        let viewModel = ReaderUserProfileViewModel(post: post)
+        let profileVC = UIHostingController(rootView: ReaderUserProfileView(viewModel: viewModel))
+        let navigationVC = UINavigationController(rootViewController: profileVC)
+        profileVC.navigationItem.leftBarButtonItem = UIBarButtonItem(systemItem: .close, primaryAction: .init { [weak profileVC] _ in
+            profileVC?.presentingViewController?.dismiss(animated: true)
+        })
+        navigationVC.sheetPresentationController?.detents = [.medium()]
+        viewController?.present(navigationVC, animated: true)
     }
-
 }
 
 extension ReaderDetailCoordinator: ReaderDetailLikesViewDelegate {

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift

@@ -108,7 +108,7 @@
                                     <constraint firstItem="iSu-TI-yew" firstAttribute="leading" secondItem="9JA-VQ-zzw" secondAttribute="leading" constant="16" placeholder="YES" id="9Vy-Wt-ZIb"/>
                                     <constraint firstItem="6yS-ZE-nbR" firstAttribute="top" secondItem="qXQ-id-Ffz" secondAttribute="bottom" id="DJi-VX-sTS"/>
                                     <constraint firstAttribute="trailing" secondItem="iSu-TI-yew" secondAttribute="trailing" constant="16" placeholder="YES" id="FvD-7O-znG"/>
-                                    <constraint firstItem="iSu-TI-yew" firstAttribute="top" secondItem="Xyq-y6-zPR" secondAttribute="bottom" constant="16" id="IET-mv-Ieo"/>
+                                    <constraint firstItem="iSu-TI-yew" firstAttribute="top" secondItem="Xyq-y6-zPR" secondAttribute="bottom" id="IET-mv-Ieo"/>
                                     <constraint firstItem="Xyq-y6-zPR" firstAttribute="top" secondItem="9JA-VQ-zzw" secondAttribute="top" id="JZU-vN-GKO"/>
                                     <constraint firstItem="6yS-ZE-nbR" firstAttribute="width" secondItem="iSu-TI-yew" secondAttribute="width" id="LmZ-4g-gFE"/>
                                     <constraint firstItem="ybg-ZD-3Ou" firstAttribute="top" secondItem="iSu-TI-yew" secondAttribute="bottom" id="QH3-gd-a9s"/>

WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.storyboard

@@ -71,7 +71,9 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
     private let activityIndicator = UIActivityIndicatorView(style: .medium)
 
     /// The actual header
-    private lazy var header = ReaderDetailHeaderHostingView()
+    private lazy var header = ReaderPostHeaderView()
+    private var cachedExcerpt: String?
+    private var cachedReadingTime: String?
 
     /// Bottom toolbar helper
     private lazy var toolbar = ReaderDetailToolbar()
@@ -251,7 +253,9 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
 
         toolbar.configure(for: post, in: self)
         updateToolbarItems()
-        header.configure(for: post)
+        cachedExcerpt = post.getUserProvidedExcerpt()
+        cachedReadingTime = Self.readingTimeString(for: post)
+        configureHeaderView(with: post)
         fetchLikes()
         fetchComments()
         checkTranslationAvailability()
@@ -401,7 +405,8 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
     }
 
     func updateHeader() {
-        header.refreshFollowButton()
+        guard let post else { return }
+        header.subscribeButton.isHidden = post.isFollowing
     }
 
     func updateLikesView(with viewModel: ReaderDetailLikesViewModel) {
@@ -490,7 +495,7 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
             headerContainerView.backgroundColor = displaySetting.color.background
 
             // Header view
-            header.displaySetting = displaySetting
+            header.apply(displaySetting)
         }
 
         // Update Reader Post web view
@@ -549,14 +554,39 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
     }
 
     private func configureHeader() {
-        header.displaySetting = displaySetting
+        header.apply(displaySetting)
         header.delegate = coordinator
+        header.translatesAutoresizingMaskIntoConstraints = false
         headerContainerView.addSubview(header)
-        headerContainerView.translatesAutoresizingMaskIntoConstraints = false
-
         headerContainerView.pinSubviewToAllEdges(header)
     }
 
+    private func configureHeaderView(with post: ReaderPost, customTitle: String? = nil) {
+        let featuredImageURL: URL? = post.contentIncludesFeaturedImage() ? nil : post.featuredImageURLForDisplay()
+        header.configure(with: ReaderPostHeaderView.ViewModel(
+            siteName: post.blogNameForDisplay(),
+            postTitle: customTitle ?? post.titleForDisplay(),
+            authorName: post.authorForDisplay() ?? "",
+            authorAvatarURL: post.avatarURLForDisplay(),
+            dateString: post.dateForDisplay()?.toMediumString() ?? "",
+            featuredImageURL: featuredImageURL,
+            excerpt: cachedExcerpt,
+            readingTime: cachedReadingTime ?? ""
+        ))
+        header.subscribeButton.isHidden = post.isFollowing
+    }
+
+    private static func readingTimeString(for post: ReaderPost) -> String {
+        String.localizedStringWithFormat(
+            NSLocalizedString(
+                "reader.detail.header.readingTime",
+                value: "%1$d min read",
+                comment: "Estimated reading time for the post. %1$d is the number of minutes."
+            ),
+            max(1, post.getEstimatedReadingTime())
+        )
+    }
+
     private func fetchLikes() {
         guard let post else {
             return
@@ -687,7 +717,7 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
             blurView.removeFromSuperview()
         }
 
-        header.configure(for: post, title: translationResults[0])
+        configureHeaderView(with: post, customTitle: translationResults[0])
         do {
             try await webView.setBodyHTML(translationResults[1])
         } catch {
@@ -897,7 +927,7 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView {
         let refreshed = notification.userInfo?[NSRefreshedObjectsKey] as? Set<NSManagedObject> ?? Set()
 
         if updated.contains(post) || refreshed.contains(post) {
-            header.configure(for: post)
+            configureHeaderView(with: post)
         }
     }
 }