Post List: Fix Visual Issues (#24647)

kean · web-flow · commit 9e1f1e053318 · 2025-07-03T00:31:47.000Z
* Fix Posts loading state

* Refinit post list look

* Improve how title and excerpt are shown

* Update release notes

* Fix loading state
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -7,6 +7,7 @@
 * [*] Add search to “Jetpack Activity List” and display actors and dates [#24597]
 * [*] Fix an issue with content in "Restore" and "Download Backup" flows covering the navigation bar [#24597]
 * [*] Show when the downloadable backup expires in Backup List [#24597]
+* [*] Fix a couple of visual issues in Post List [#24647]
 
 25.9
 -----
diff --git a/Sources/WordPressData/Swift/Post.swift b/Sources/WordPressData/Swift/Post.swift
@@ -231,14 +231,14 @@ public class Post: AbstractPost {
             if let preview = PostPreviewCache.shared.excerpt[excerpt] {
                 return preview
             }
-            let preview = excerpt.makePlainText()
+            let preview = excerpt.makePlainText().withCollapsedNewlines()
             PostPreviewCache.shared.excerpt[excerpt] = preview
             return preview
         } else if let content {
             if let preview = PostPreviewCache.shared.content[content] {
                 return preview
             }
-            let preview = content.summarized()
+            let preview = content.summarized().withCollapsedNewlines()
             PostPreviewCache.shared.content[content] = preview
             return preview
         } else {
@@ -260,6 +260,13 @@ public class Post: AbstractPost {
     }
 }
 
+private extension String {
+    // Normalize newlines by collapsing multiple occurrences of newlines to a single newline
+    func withCollapsedNewlines() -> String {
+        replacingOccurrences(of: "[\n]{2,}", with: "\n", options: .regularExpression)
+    }
+}
+
 private final class PostPreviewCache {
     static let shared = PostPreviewCache()
 
diff --git a/WordPress/Classes/ViewRelated/Media/NoResultsViewController+MediaLibrary.swift b/WordPress/Classes/ViewRelated/Media/NoResultsViewController+MediaLibrary.swift
@@ -10,7 +10,7 @@ extension NoResultsViewController {
     }
 
     @objc func configureForFetching() {
-        configure(title: LocalizedText.fetchingTitle, accessoryView: NoResultsViewController.loadingAccessoryView())
+        configure(title: "", accessoryView: NoResultsViewController.loadingAccessoryView())
         view.layoutIfNeeded()
     }
 
diff --git a/WordPress/Classes/ViewRelated/Pages/Controllers/PageListViewController.swift b/WordPress/Classes/ViewRelated/Pages/Controllers/PageListViewController.swift
@@ -471,7 +471,7 @@ private extension PageListViewController {
 
     func noResultsTitle() -> String {
         if syncHelper.isSyncing == true {
-            return NoResultsText.fetchingTitle
+            return ""
         }
         return noResultsFilteredTitle()
     }
@@ -493,7 +493,6 @@ private extension PageListViewController {
     }
 
     struct NoResultsText {
-        static let fetchingTitle = NSLocalizedString("Fetching pages...", comment: "A brief prompt shown when the reader is empty, letting the user know the app is currently fetching new pages.")
         static let noDraftsTitle = NSLocalizedString("You don't have any draft pages", comment: "Displayed when the user views drafts in the pages list and there are no pages")
         static let noScheduledTitle = NSLocalizedString("You don't have any scheduled pages", comment: "Displayed when the user views scheduled pages in the pages list and there are no pages")
         static let noTrashedTitle = NSLocalizedString("You don't have any trashed pages", comment: "Displayed when the user views trashed in the pages list and there are no pages")
diff --git a/WordPress/Classes/ViewRelated/Pages/Views/PageListCell.swift b/WordPress/Classes/ViewRelated/Pages/Views/PageListCell.swift
@@ -21,11 +21,16 @@ final class PageListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
 
     // MARK: - PostSearchResultCell
 
-    var attributedText: NSAttributedString? {
+    var titleAttributedText: NSAttributedString? {
         get { titleLabel.attributedText }
         set { titleLabel.attributedText = newValue }
     }
 
+    var excerptAttributedText: NSAttributedString? {
+        get { nil }  // Pages don't have excerpts in the list
+        set { }  // Pages don't have excerpts in the list
+    }
+
     // MARK: AbstractPostListCell
 
     var post: AbstractPost? { viewModel?.page }
diff --git a/WordPress/Classes/ViewRelated/Post/Controllers/AbstractPostListViewController.swift b/WordPress/Classes/ViewRelated/Post/Controllers/AbstractPostListViewController.swift
@@ -300,7 +300,7 @@ class AbstractPostListViewController: UIViewController,
         if noResultsViewController.view.isDescendant(of: tableView) == false {
             self.addChild(noResultsViewController)
             tableView.addSubview(noResultsViewController.view)
-            noResultsViewController.view.frame = tableView.frame.offsetBy(dx: 0, dy: -view.safeAreaInsets.top + 40)
+            noResultsViewController.view.pinEdges(to: view.safeAreaLayoutGuide)
             noResultsViewController.didMove(toParent: self)
         }
 
diff --git a/WordPress/Classes/ViewRelated/Post/Controllers/PostListViewController.swift b/WordPress/Classes/ViewRelated/Post/Controllers/PostListViewController.swift
@@ -284,7 +284,7 @@ private extension PostListViewController {
 
     func noResultsTitle() -> String {
         if syncHelper.isSyncing == true {
-            return NoResultsText.fetchingTitle
+            return ""
         }
         return noResultsFilteredTitle()
     }
@@ -306,7 +306,6 @@ private extension PostListViewController {
     }
 
     struct NoResultsText {
-        static let fetchingTitle = NSLocalizedString("Fetching posts...", comment: "A brief prompt shown when the reader is empty, letting the user know the app is currently fetching new posts.")
         static let noDraftsTitle = NSLocalizedString("You don't have any draft posts", comment: "Displayed when the user views drafts in the posts list and there are no posts")
         static let noScheduledTitle = NSLocalizedString("You don't have any scheduled posts", comment: "Displayed when the user views scheduled posts in the posts list and there are no posts")
         static let noTrashedTitle = NSLocalizedString("You don't have any trashed posts", comment: "Displayed when the user views trashed in the posts list and there are no posts")
diff --git a/WordPress/Classes/ViewRelated/Post/Search/PostSearchViewController.swift b/WordPress/Classes/ViewRelated/Post/Search/PostSearchViewController.swift
@@ -235,10 +235,19 @@ final class PostSearchViewController: UIViewController, UITableViewDelegate, UIS
         for cell in cells {
             guard let cell = cell as? PostSearchResultCell else { continue }
 
-            assert(cell.attributedText != nil)
-            let string = NSMutableAttributedString(attributedString: cell.attributedText ?? .init())
-            PostSearchViewModel.highlight(terms: terms, in: string)
-            cell.attributedText = string
+            // Highlight title
+            if let titleText = cell.titleAttributedText {
+                let titleString = NSMutableAttributedString(attributedString: titleText)
+                PostSearchViewModel.highlight(terms: terms, in: titleString)
+                cell.titleAttributedText = titleString
+            }
+
+            // Highlight excerpt
+            if let excerptText = cell.excerptAttributedText {
+                let excerptString = NSMutableAttributedString(attributedString: excerptText)
+                PostSearchViewModel.highlight(terms: terms, in: excerptString)
+                cell.excerptAttributedText = excerptString
+            }
         }
     }
 }
@@ -250,5 +259,6 @@ private enum Constants {
 }
 
 protocol PostSearchResultCell: AnyObject {
-    var attributedText: NSAttributedString? { get set }
+    var titleAttributedText: NSAttributedString? { get set }
+    var excerptAttributedText: NSAttributedString? { get set }
 }
diff --git a/WordPress/Classes/ViewRelated/Post/Views/AbstractPostHelper.swift b/WordPress/Classes/ViewRelated/Post/Views/AbstractPostHelper.swift
@@ -40,14 +40,15 @@ enum AbstractPostHelper {
         for (badge, color) in badges {
             if string.length > 0 {
                 string.append(NSAttributedString(string: " · ", attributes: [
-                    .foregroundColor: UIColor.secondaryLabel
+                    .foregroundColor: UIColor.secondaryLabel,
+                    .font: UIFont.preferredFont(forTextStyle: .footnote).withWeight(.bold)
                 ]))
             }
             string.append(NSAttributedString(string: badge, attributes: [
-                .foregroundColor: color ?? UIColor.secondaryLabel
+                .foregroundColor: color ?? UIColor.secondaryLabel,
+                .font: UIFont.preferredFont(forTextStyle: .footnote)
             ]))
         }
-        string.addAttribute(.font, value: WPStyleGuide.fontForTextStyle(.footnote), range: NSRange(location: 0, length: string.length))
         return string
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift b/WordPress/Classes/ViewRelated/Post/Views/PostListCell.swift
@@ -26,7 +26,8 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
 
     private let headerView = PostListHeaderView()
     private let ellipsisButton = UIButton(type: .system)
-    private let contentLabel = UILabel()
+    private let titleLabel = UILabel()
+    private let excerptLabel = UILabel()
     private let featuredImageView = AsyncImageView()
     private let statusLabel = UILabel()
 
@@ -36,9 +37,14 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
 
     // MARK: - PostSearchResultCell
 
-    var attributedText: NSAttributedString? {
-        get { contentLabel.attributedText }
-        set { contentLabel.attributedText = newValue }
+    var titleAttributedText: NSAttributedString? {
+        get { titleLabel.attributedText }
+        set { titleLabel.attributedText = newValue }
+    }
+
+    var excerptAttributedText: NSAttributedString? {
+        get { excerptLabel.attributedText }
+        set { excerptLabel.attributedText = newValue }
     }
 
     // MARK: AbstractPostListCell
@@ -73,7 +79,8 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
 
     private func _configure(with viewModel: PostListItemViewModel, delegate: InteractivePostViewDelegate? = nil) {
         headerView.configure(with: viewModel)
-        contentLabel.attributedText = viewModel.content
+        titleLabel.attributedText = viewModel.title
+        excerptLabel.attributedText = viewModel.excerpt
 
         featuredImageView.isHidden = viewModel.imageURL == nil
         featuredImageView.layer.opacity = viewModel.syncStateViewModel.isEditable ? 1 : 0.25
@@ -111,15 +118,20 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
     // MARK: - Setup
 
     private func setupViews() {
-        setupContentLabel()
+        setupTitleLabel()
+        setupExcerptLabel()
         setupFeaturedImageView()
         setupStatusLabel()
 
+        let textStackView = UIStackView(arrangedSubviews: [titleLabel, excerptLabel])
+        textStackView.axis = .vertical
+        textStackView.spacing = 3
+
         contentStackView.addArrangedSubviews([
-            contentLabel,
+            textStackView,
             featuredImageView
         ])
-        contentStackView.spacing = 16
+        contentStackView.spacing = 8
         contentStackView.alignment = .top
 
         mainStackView.addArrangedSubviews([
@@ -128,24 +140,32 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
             statusLabel
         ])
         mainStackView.spacing = 4
+        mainStackView.setCustomSpacing(5, after: headerView)
         contentView.addSubview(mainStackView)
-        mainStackView.pinEdges(to: contentView.layoutMarginsGuide)
+        mainStackView.pinEdges(to: contentView.layoutMarginsGuide, insets: UIEdgeInsets(top: 0, left: 0, bottom: 2, right: -2))
 
         // It is added last to ensure it's tappable
         setupEllipsisButton()
     }
 
-    private func setupContentLabel() {
-        contentLabel.adjustsFontForContentSizeCategory = true
-        contentLabel.numberOfLines = 3
-        contentLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+    private func setupTitleLabel() {
+        titleLabel.adjustsFontForContentSizeCategory = true
+        titleLabel.numberOfLines = 2
+        titleLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+    }
+
+    private func setupExcerptLabel() {
+        excerptLabel.adjustsFontForContentSizeCategory = true
+        excerptLabel.numberOfLines = 2
+        excerptLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
     }
 
     private func setupFeaturedImageView() {
         featuredImageView.contentMode = .scaleAspectFill
         featuredImageView.layer.masksToBounds = true
-        featuredImageView.layer.cornerRadius = 5
+        featuredImageView.layer.cornerRadius = 8
         featuredImageView.setContentCompressionResistancePriority(.defaultHigh, for: .vertical)
+        featuredImageView.configuration.isErrorViewEnabled = false
 
         NSLayoutConstraint.activate([
             featuredImageView.widthAnchor.constraint(equalToConstant: Constants.imageSize.width),
@@ -161,11 +181,12 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
 
     private func setupEllipsisButton() {
         ellipsisButton.setImage(UIImage(named: "more-horizontal-mobile"), for: .normal)
-        ellipsisButton.tintColor = .secondaryLabel
+        ellipsisButton.tintColor = .tertiaryLabel
 
+        /// warning: See `spacer` in `PostListHeaderView` to understand the layout
         NSLayoutConstraint.activate([
-            ellipsisButton.heightAnchor.constraint(equalToConstant: 44),
-            ellipsisButton.widthAnchor.constraint(equalToConstant: 54)
+            ellipsisButton.heightAnchor.constraint(equalToConstant: 40),
+            ellipsisButton.widthAnchor.constraint(equalToConstant: 56)
         ])
 
         contentView.addSubview(ellipsisButton)
@@ -174,5 +195,5 @@ final class PostListCell: UITableViewCell, AbstractPostListCell, PostSearchResul
 }
 
 private enum Constants {
-    static let imageSize = CGSize(width: 64, height: 64)
+    static let imageSize = CGSize(width: 54, height: 54)
 }
diff --git a/WordPress/Classes/ViewRelated/Post/Views/PostListHeaderView.swift b/WordPress/Classes/ViewRelated/Post/Views/PostListHeaderView.swift
@@ -8,6 +8,7 @@ final class PostListHeaderView: UIView {
     private let textLabel = UILabel()
     private let icon = UIImageView()
     private let indicator = UIActivityIndicatorView(style: .medium)
+    private let spacer = SpacerView(width: 24)
 
     // MARK: - Initializer
 
@@ -34,6 +35,7 @@ final class PostListHeaderView: UIView {
         }
         icon.isHidden = viewModel.iconInfo == nil
         indicator.isHidden = !viewModel.isShowingIndicator
+        spacer.isHidden = !viewModel.isShowingEllipsis
 
         if viewModel.isShowingIndicator {
             indicator.startAnimating()
@@ -46,7 +48,7 @@ final class PostListHeaderView: UIView {
         setupIcon()
 
         // Trailing spacer to allocate enough space for the "More" button.
-        let accessoriesStackView = UIStackView(arrangedSubviews: [icon, indicator, SpacerView(width: 40)])
+        let accessoriesStackView = UIStackView(arrangedSubviews: [icon, indicator, spacer])
         accessoriesStackView.spacing = 4
         let stackView = UIStackView(arrangedSubviews: [textLabel, accessoriesStackView])
 
diff --git a/WordPress/Classes/ViewRelated/Post/Views/PostListItemViewModel.swift b/WordPress/Classes/ViewRelated/Post/Views/PostListItemViewModel.swift
@@ -4,7 +4,8 @@ import WordPressShared
 
 final class PostListItemViewModel {
     let post: Post
-    let content: NSAttributedString
+    let title: NSAttributedString
+    let excerpt: NSAttributedString
     let imageURL: URL?
     let badges: NSAttributedString
     let syncStateViewModel: PostSyncStateViewModel
@@ -20,7 +21,8 @@ final class PostListItemViewModel {
         self.statusViewModel = PostCardStatusViewModel(post: post)
         self.syncStateViewModel = PostSyncStateViewModel(post: post)
         self.badges = makeBadgesString(for: post, syncStateViewModel: syncStateViewModel, shouldHideAuthor: shouldHideAuthor)
-        self.content = makeContentString(for: post, syncStateViewModel: syncStateViewModel)
+        self.title = makeTitleString(for: post, isDisabled: !syncStateViewModel.isEditable)
+        self.excerpt = makeExcerptString(for: post, isDisabled: !syncStateViewModel.isEditable)
     }
 }
 
@@ -60,36 +62,39 @@ private func makeAccessibilityLabel(for post: Post, statusViewModel: PostCardSta
         .joined(separator: " ")
 }
 
-private func makeContentString(for post: Post, syncStateViewModel: PostSyncStateViewModel) -> NSAttributedString {
+private func makeTitleString(for post: Post, isDisabled: Bool) -> NSAttributedString {
     let title = post.titleForDisplay()
-    let snippet = post.contentPreviewForDisplay()
-    let foregroundColor = syncStateViewModel.isEditable ? UIColor.label : UIColor.tertiaryLabel
-
-    let string = NSMutableAttributedString()
-    if !title.isEmpty {
-        let attributes: [NSAttributedString.Key: Any] = [
-            .font: WPStyleGuide.fontForTextStyle(.callout, fontWeight: .semibold),
-            .foregroundColor: foregroundColor
-        ]
-        let titleAttributedString = NSAttributedString(string: title, attributes: attributes)
-        string.append(titleAttributedString)
-    }
-    if !snippet.isEmpty {
-        // Normalize newlines by collapsing multiple occurrences of newlines to a single newline
-        let adjustedSnippet = snippet.replacingOccurrences(of: "[\n]{2,}", with: "\n", options: .regularExpression)
-        if string.length > 0 {
-            string.append(NSAttributedString(string: "\n"))
-        }
-        let attributes: [NSAttributedString.Key: Any] = [
-            .font: WPStyleGuide.fontForTextStyle(.footnote, fontWeight: .regular),
-            .foregroundColor: foregroundColor
-        ]
-        let snippetAttributedString = NSAttributedString(string: adjustedSnippet, attributes: attributes)
-        string.append(snippetAttributedString)
-    }
+
+    let foregroundColor = isDisabled ? UIColor.tertiaryLabel : UIColor.label
+
+    let attributes: [NSAttributedString.Key: Any] = [
+        .font: UIFont.preferredFont(forTextStyle: .headline),
+        .foregroundColor: foregroundColor
+    ]
+
+    let paragraphStyle = NSMutableParagraphStyle()
+    paragraphStyle.lineBreakMode = .byTruncatingTail
+
+    let string = NSMutableAttributedString(string: title, attributes: attributes)
+    string.addAttribute(.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: string.length))
+
+    return string
+}
+
+private func makeExcerptString(for post: Post, isDisabled: Bool) -> NSAttributedString {
+    let excerpt = post.contentPreviewForDisplay()
+
+    let foregroundColor = isDisabled ? UIColor.tertiaryLabel : UIColor.secondaryLabel
+
+    let attributes: [NSAttributedString.Key: Any] = [
+        .font: UIFont.preferredFont(forTextStyle: .subheadline),
+        .foregroundColor: foregroundColor
+    ]
 
     let paragraphStyle = NSMutableParagraphStyle()
-    paragraphStyle.paragraphSpacing = 4
+    paragraphStyle.lineBreakMode = .byTruncatingTail
+
+    let string = NSMutableAttributedString(string: excerpt, attributes: attributes)
     string.addAttribute(.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: string.length))
 
     return string

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ extension NoResultsViewController {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`@objc func configureForFetching() {`
`13`		`- configure(title: LocalizedText.fetchingTitle, accessoryView: NoResultsViewController.loadingAccessoryView())`
	`13`	`+ configure(title: "", accessoryView: NoResultsViewController.loadingAccessoryView())`
`14`	`14`	`view.layoutIfNeeded()`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ private extension PageListViewController {`
`471`	`471`
`472`	`472`	`func noResultsTitle() -> String {`
`473`	`473`	`if syncHelper.isSyncing == true {`
`474`		`- return NoResultsText.fetchingTitle`
	`474`	`+ return ""`
`475`	`475`	`}`
`476`	`476`	`return noResultsFilteredTitle()`
`477`	`477`	`}`
`@@ -493,7 +493,6 @@ private extension PageListViewController {`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`struct NoResultsText {`
`496`		`- static let fetchingTitle = NSLocalizedString("Fetching pages...", comment: "A brief prompt shown when the reader is empty, letting the user know the app is currently fetching new pages.")`
`497`	`496`	`static let noDraftsTitle = NSLocalizedString("You don't have any draft pages", comment: "Displayed when the user views drafts in the pages list and there are no pages")`
`498`	`497`	`static let noScheduledTitle = NSLocalizedString("You don't have any scheduled pages", comment: "Displayed when the user views scheduled pages in the pages list and there are no pages")`
`499`	`498`	`static let noTrashedTitle = NSLocalizedString("You don't have any trashed pages", comment: "Displayed when the user views trashed in the pages list and there are no pages")`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ class AbstractPostListViewController: UIViewController,`
`300`	`300`	`if noResultsViewController.view.isDescendant(of: tableView) == false {`
`301`	`301`	`self.addChild(noResultsViewController)`
`302`	`302`	`tableView.addSubview(noResultsViewController.view)`
`303`		`- noResultsViewController.view.frame = tableView.frame.offsetBy(dx: 0, dy: -view.safeAreaInsets.top + 40)`
	`303`	`+ noResultsViewController.view.pinEdges(to: view.safeAreaLayoutGuide)`
`304`	`304`	`noResultsViewController.didMove(toParent: self)`
`305`	`305`	`}`
`306`	`306`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ private extension PostListViewController {`
`284`	`284`
`285`	`285`	`func noResultsTitle() -> String {`
`286`	`286`	`if syncHelper.isSyncing == true {`
`287`		`- return NoResultsText.fetchingTitle`
	`287`	`+ return ""`
`288`	`288`	`}`
`289`	`289`	`return noResultsFilteredTitle()`
`290`	`290`	`}`
`@@ -306,7 +306,6 @@ private extension PostListViewController {`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`struct NoResultsText {`
`309`		`- static let fetchingTitle = NSLocalizedString("Fetching posts...", comment: "A brief prompt shown when the reader is empty, letting the user know the app is currently fetching new posts.")`
`310`	`309`	`static let noDraftsTitle = NSLocalizedString("You don't have any draft posts", comment: "Displayed when the user views drafts in the posts list and there are no posts")`
`311`	`310`	`static let noScheduledTitle = NSLocalizedString("You don't have any scheduled posts", comment: "Displayed when the user views scheduled posts in the posts list and there are no posts")`
`312`	`311`	`static let noTrashedTitle = NSLocalizedString("You don't have any trashed posts", comment: "Displayed when the user views trashed in the posts list and there are no posts")`
Original file line number	Diff line number	Diff line change
`@@ -235,10 +235,19 @@ final class PostSearchViewController: UIViewController, UITableViewDelegate, UIS`
`235`	`235`	`for cell in cells {`
`236`	`236`	`guard let cell = cell as? PostSearchResultCell else { continue }`
`237`	`237`
`238`		`- assert(cell.attributedText != nil)`
`239`		`- let string = NSMutableAttributedString(attributedString: cell.attributedText ?? .init())`
`240`		`- PostSearchViewModel.highlight(terms: terms, in: string)`
`241`		`- cell.attributedText = string`
	`238`	`+ // Highlight title`
	`239`	`+ if let titleText = cell.titleAttributedText {`
	`240`	`+ let titleString = NSMutableAttributedString(attributedString: titleText)`
	`241`	`+ PostSearchViewModel.highlight(terms: terms, in: titleString)`
	`242`	`+ cell.titleAttributedText = titleString`
	`243`	`+ }`
	`244`	`+`
	`245`	`+ // Highlight excerpt`
	`246`	`+ if let excerptText = cell.excerptAttributedText {`
	`247`	`+ let excerptString = NSMutableAttributedString(attributedString: excerptText)`
	`248`	`+ PostSearchViewModel.highlight(terms: terms, in: excerptString)`
	`249`	`+ cell.excerptAttributedText = excerptString`
	`250`	`+ }`
`242`	`251`	`}`
`243`	`252`	`}`
`244`	`253`	`}`
`@@ -250,5 +259,6 @@ private enum Constants {`
`250`	`259`	`}`
`251`	`260`
`252`	`261`	`protocol PostSearchResultCell: AnyObject {`
`253`		`- var attributedText: NSAttributedString? { get set }`
	`262`	`+ var titleAttributedText: NSAttributedString? { get set }`
	`263`	`+ var excerptAttributedText: NSAttributedString? { get set }`
`254`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,15 @@ enum AbstractPostHelper {`
`40`	`40`	`for (badge, color) in badges {`
`41`	`41`	`if string.length > 0 {`
`42`	`42`	`string.append(NSAttributedString(string: " · ", attributes: [`
`43`		`- .foregroundColor: UIColor.secondaryLabel`
	`43`	`+ .foregroundColor: UIColor.secondaryLabel,`
	`44`	`+ .font: UIFont.preferredFont(forTextStyle: .footnote).withWeight(.bold)`
`44`	`45`	`]))`
`45`	`46`	`}`
`46`	`47`	`string.append(NSAttributedString(string: badge, attributes: [`
`47`		`- .foregroundColor: color ?? UIColor.secondaryLabel`
	`48`	`+ .foregroundColor: color ?? UIColor.secondaryLabel,`
	`49`	`+ .font: UIFont.preferredFont(forTextStyle: .footnote)`
`48`	`50`	`]))`
`49`	`51`	`}`
`50`		`- string.addAttribute(.font, value: WPStyleGuide.fontForTextStyle(.footnote), range: NSRange(location: 0, length: string.length))`
`51`	`52`	`return string`
`52`	`53`	`}`
`53`	`54`	`}`